aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-07-24 11:49:26 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-07-24 11:49:26 +0200
commitfbb2fc5580411ce2fbc088963210db7f833441a8 (patch)
tree48e79d882ad53288db83302bfbd422bc7782b5fd
parent2fe3d240ccce3139f1293c97735cb3457de85b83 (diff)
downloadyoutube-dl-fbb2fc5580411ce2fbc088963210db7f833441a8.tar.xz
Group cache-related options under filesystem
-rw-r--r--youtube_dl/__init__.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index c3eb29bf4..fbd03faf4 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -249,12 +249,6 @@ def parseOpts(overrideArguments=None):
'--proxy', dest='proxy', default=None, metavar='URL',
help='Use the specified HTTP/HTTPS proxy. Pass in an empty string (--proxy "") for direct connection')
general.add_option(
- '--cache-dir', dest='cachedir', default=get_cachedir(), metavar='DIR',
- help='Location in the filesystem where youtube-dl can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dl or ~/.cache/youtube-dl . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
- general.add_option(
- '--no-cache-dir', action='store_const', const=None, dest='cachedir',
- help='Disable filesystem caching')
- general.add_option(
'--socket-timeout', dest='socket_timeout',
type=float, default=None, help=u'Time to wait before giving up, in seconds')
general.add_option(
@@ -511,6 +505,12 @@ def parseOpts(overrideArguments=None):
filesystem.add_option('--write-thumbnail',
action='store_true', dest='writethumbnail',
help='write thumbnail image to disk', default=False)
+ filesystem.add_option(
+ '--cache-dir', dest='cachedir', default=get_cachedir(), metavar='DIR',
+ help='Location in the filesystem where youtube-dl can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dl or ~/.cache/youtube-dl . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
+ filesystem.add_option(
+ '--no-cache-dir', action='store_const', const=None, dest='cachedir',
+ help='Disable filesystem caching')
postproc.add_option('-x', '--extract-audio', action='store_true', dest='extractaudio', default=False,