summaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorFilippo Valsorda <[email protected]>2012-12-08 01:57:43 +0100
committerFilippo Valsorda <[email protected]>2012-12-08 01:57:43 +0100
commit3c6ffbaedbbae8734f6b86fea1169413b656abf3 (patch)
tree27edbd964e1411e0228900b1c36612058cca7954 /youtube_dl/__init__.py
parentc7287a3cafba65b700b64633d76aa016f5cbc95d (diff)
parent863baa16eca7a98c38fb29c5e54f76df224f2351 (diff)
downloadyoutube-dl-3c6ffbaedbbae8734f6b86fea1169413b656abf3.tar.gz
youtube-dl-3c6ffbaedbbae8734f6b86fea1169413b656abf3.zip
Merge 'rg3/master' into fork_master
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f953f1fb9..8e46dfea9 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -305,7 +305,7 @@ def parseOpts():
action='store_true', dest='autonumber',
help='number downloaded files starting from 00000', default=False)
filesystem.add_option('-o', '--output',
- dest='outtmpl', metavar='TEMPLATE', help='output filename template. Use %(title)s to get the title, %(uploader)s for the uploader name, %(autonumber)s to get an automatically incremented number, %(ext)s for the filename extension, %(upload_date)s for the upload date (YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc), %(id)s for the video id and %% for a literal percent. Use - to output to stdout.')
+ dest='outtmpl', metavar='TEMPLATE', help='output filename template. Use %(title)s to get the title, %(uploader)s for the uploader name, %(autonumber)s to get an automatically incremented number, %(ext)s for the filename extension, %(upload_date)s for the upload date (YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc), %(id)s for the video id and %% for a literal percent. Use - to output to stdout. Can also be used to download to a different directory, for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .')
filesystem.add_option('--restrict-filenames',
action='store_true', dest='restrictfilenames',
help='Restrict filenames to only ASCII characters, and avoid "&" and spaces in filenames', default=False)