From: Jeff Crouse Date: Sat, 5 Jan 2013 20:03:54 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/rg3/youtube-dl X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=258d5850c91e0d37a36c6bae0a25314f8149b05a;p=youtube-dl Merge branch 'master' of https://github.com/rg3/youtube-dl Conflicts: .gitignore LATEST_VERSION Makefile youtube-dl youtube-dl.exe youtube_dl/InfoExtractors.py youtube_dl/__init__.py --- 258d5850c91e0d37a36c6bae0a25314f8149b05a diff --cc LATEST_VERSION index 000000000,275de03d9..d070c6ea3 mode 000000,100644..100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@@ -1,0 -1,1 +1,1 @@@ -9999.99.99 ++2012.10.09 diff --cc README.md index 0ac75f5d7,b3cd9a38c..4b0de1b88 --- a/README.md +++ b/README.md @@@ -34,19 -39,25 +39,25 @@@ which means you can modify it, redistri caseless sub-string) --max-downloads NUMBER Abort after downloading NUMBER files -## Filesystem Options: + Filesystem Options: -t, --title use title in file name --id use video ID in file name - -l, --literal use literal title in file name + -l, --literal [deprecated] alias of --title -A, --auto-number number downloaded files starting from 00000 - -o, --output TEMPLATE output filename template. Use %(stitle)s to get the + -o, --output TEMPLATE 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. + %(uploader_id)s for the uploader nickname if + different, %(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/%(upl + oader)s/%(title)s-%(id)s.%(ext)s' . + --restrict-filenames Restrict filenames to only ASCII characters, and + avoid "&" and spaces in filenames -a, --batch-file FILE file containing URLs to download ('-' for stdin) -w, --no-overwrites do not overwrite files -c, --continue resume partially downloaded files diff --cc youtube-dl index 000000000,e6f05c173..6ba864a14 mode 000000,100755..100755 Binary files differ