diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 10bfc7790..9dda204d6 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -4,31 +4,31 @@ Usage: youtube-dl (--help | --version) youtube-dl URL ... [--update] [--ignore-errors] [--dump-user-agent] - [--user-agent UA] [--referer REF] [--list-extractors] - [--extractor-descriptions] [--proxy URL] + [--user-agent=UA] [--referer REF] [--list-extractors] + [--extractor-descriptions] [--proxy=URL] [--no-check-certificate] [--cache-dir] [--no-cache-dir] - [--playlist-start NUMBER] [--playlist-end NUMBER] - [--match-title REGEX] [--reject-title REGEX] - [--max-downloads NUMBER] [--min-filesize SIZE] - [--max-filesize SIZE] [--date DATE] [--datebefore DATE] - [--dateafter DATE] [--no-playlist] [--rate-limit LIMIT] - [--retries RETRIES] [--buffer-size SIZE] [--no-resize-buffer] - [--title] [--id] [--auto-number] [--output TEMPLATE] - [--autonumber-size NUMBER] [--restrict-filenames] - [--batch-file FILE] [--no-overwrites] [--continue | --no-continue] - [--cookies FILE] [--no-part] [--no-mtime] [--write-description] + [--playlist-start=NUMBER] [--playlist-end=NUMBER] + [--match-title=REGEX] [--reject-title=REGEX] + [--max-downloads=NUMBER] [--min-filesize=SIZE] + [--max-filesize=SIZE] [--date=DATE] [--datebefore=DATE] + [--dateafter=DATE] [--no-playlist] [--rate-limit=LIMIT] + [--retries=RETRIES] [--buffer-size=SIZE] [--no-resize-buffer] + [--title] [--id] [--auto-number] [--output=TEMPLATE] + [--autonumber-size=NUMBER] [--restrict-filenames] + [--batch-file=FILE] [--no-overwrites] [--continue | --no-continue] + [--cookies=FILE] [--no-part] [--no-mtime] [--write-description] [--write-info-json] [--write-thumbnail] [--quiet] [--simulate] [--skip-download] [--get-url] [--get-title] [--get-id] [--get-thumbnail] [--get-description] [--get-filename] [--get-format] [--newline] [--no-progress] [--console-title] - [--verbose] [--dump-intermediate-pages] [--format FORMAT ] - [--all-formats] [--prefer-free-formats] [--max-quality FORMAT ] + [--verbose] [--dump-intermediate-pages] [--format=FORMAT ] + [--all-formats] [--prefer-free-formats] [--max-quality=FORMAT ] [--list-formats] [--write-sub] [--write-auto-sub] [--all-subs] - [--list-subs] [--sub-format FORMAT] [--sub-langs LANGS] - [--username USERNAME --password PASSWORD | --netrc] - [--video-password PASSWORD] [--extract-audio] - [--audio-format FORMAT] [--audio-quality QUALITY] - [--recode-video FORMAT] [--keep-video] [--no-post-overwrites] + [--list-subs] [--sub-format=FORMAT] [--sub-langs=LANGS...] + [--username=USERNAME --password=PASSWORD | --netrc] + [--video-password=PASSWORD] [--extract-audio] + [--audio-format=FORMAT] [--audio-quality=QUALITY] + [--recode-video=FORMAT] [--keep-video] [--no-post-overwrites] [--embed-subs] Options: @@ -41,13 +41,13 @@ Options: -i --ignore-errors continue on download errors, for example to to skip unavailable videos in a playlist --dump-user-agent display the current browser identification - --user-agent UA specify a custom user agent - --referer REF specify a custom referer, use if the video access + --user-agent=UA specify a custom user agent + --referer=REF specify a custom referer, use if the video access is restricted to one domain --list-extractors List all supported extractors and the URLs they would handle --extractor-descriptions Output descriptions of all supported extractors - --proxy URL Use the specified HTTP/HTTPS proxy + --proxy=URL Use the specified HTTP/HTTPS proxy --no-check-certificate Suppress HTTPS certificate validation. --cache-dir Location in the filesystem where youtube-dl can store downloaded information permanently. By @@ -56,37 +56,37 @@ Options: --no-cache-dir Disable filesystem caching Video Selection: - --playlist-start NUMBER playlist video to start at [default: 1] - --playlist-end NUMBER playlist video to end at (defaults to last) + --playlist-start=NUMBER playlist video to start at [default: 1] + --playlist-end=NUMBER playlist video to end at (defaults to last) [default: -1] - --match-title REGEX download only matching titles (regex or caseless + --match-title=REGEX download only matching titles (regex or caseless sub-string) - --reject-title REGEX skip download for matching titles (regex or + --reject-title=REGEX skip download for matching titles (regex or caseless sub-string) - --max-downloads NUMBER Abort after downloading NUMBER files - --min-filesize SIZE Do not download any videos smaller than SIZE + --max-downloads=NUMBER Abort after downloading NUMBER files + --min-filesize=SIZE Do not download any videos smaller than SIZE (e.g. 50k or 44.6m) - --max-filesize SIZE Do not download any videos larger than SIZE (e.g. + --max-filesize=SIZE Do not download any videos larger than SIZE (e.g. 50k or 44.6m) - --date DATE download only videos uploaded in this date - --datebefore DATE download only videos uploaded before this date - --dateafter DATE download only videos uploaded after this date + --date=DATE download only videos uploaded in this date + --datebefore=DATE download only videos uploaded before this date + --dateafter=DATE download only videos uploaded after this date --no-playlist download only the currently playing video Download Options: - -r --rate-limit LIMIT maximum download rate (e.g. 50k or 44.6m) - -R --retries RETRIES number of retries [default: 10] - --buffer-size SIZE size of download buffer (e.g. 1024 or 16k) + -r --rate-limit=LIMIT maximum download rate (e.g. 50k or 44.6m) + -R --retries=RETRIES number of retries [default: 10] + --buffer-size=SIZE size of download buffer (e.g. 1024 or 16k) [default: 1024] --no-resize-buffer do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE. Filesystem Options: - -t --title use title in file name (default) + -t --title use title in file name (default action) --id use only video ID in file name -A --auto-number number downloaded files starting from 00000 - -o --output TEMPLATE output filename template. Use %(title)s to get + -o --output=TEMPLATE output filename template. Use %(title)s to get the title, %(uploader)s for the uploader name, %(uploader_id)s for the uploader nickname if different, %(autonumber)s to get an automatically @@ -100,17 +100,17 @@ Options: output to stdout. Can also be used to download to a different directory, for example with -o '/my/d ownloads/%(uploader)s/%(title)s-%(id)s.%(ext)s' . - --autonumber-size NUMBER Specifies the number of digits in %(autonumber)s + --autonumber-size=NUMBER Specifies the number of digits in %(autonumber)s when it is present in output filename template or --autonumber option is given --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) + -a --batch-file=FILE file containing URLs to download ('-' for stdin) -w --no-overwrites do not overwrite files -c --continue resume partially downloaded files --no-continue do not resume partially downloaded files (restart from beginning) - --cookies FILE file to read cookies from and dump cookie jar in + --cookies=FILE file to read cookies from and dump cookie jar in --no-part do not use .part files --no-mtime do not use the Last-modified header to set the file modification time @@ -138,13 +138,13 @@ Options: verbose) Video Format Options: - -f --format FORMAT video format code, specifiy the order of + -f --format=FORMAT video format code, specifiy the order of preference using slashes: "-f 22/17/18". "-f mp4" and "-f flv" are also supported --all-formats download all available video formats --prefer-free-formats prefer free video formats unless a specific one is requested - --max-quality FORMAT highest quality format to download + --max-quality=FORMAT highest quality format to download -F --list-formats list all available formats (currently youtube only) @@ -154,27 +154,27 @@ Options: --all-subs downloads all the available subtitles of the video --list-subs lists all available subtitles for the video - --sub-format FORMAT subtitle format ([sbv/vtt] youtube only) + --sub-format=FORMAT subtitle format ([sbv/vtt] youtube only) [default: srt] - --sub-langs LANGS ... languages of the subtitles to download (optional, + --sub-langs=LANGS ... languages of the subtitles to download (optional, multiple arguments) use IETF language tags like 'en,pt' Authentication Options: - -u --username USERNAME account username - -p --password PASSWORD account password + -u --username=USERNAME account username + -p --password=PASSWORD account password -n --netrc use .netrc authentication data - --video-password PASSWORD video password (vimeo only) + --video-password=PASSWORD video password (vimeo only) Post-processing Options: -x --extract-audio convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe) - --audio-format FORMAT "best", "aac", "vorbis", "mp3", "m4a", "opus", or + --audio-format=FORMAT "best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; [default: best] - --audio-quality QUALITY ffmpeg/avconv audio quality specification, insert + --audio-quality=QUALITY ffmpeg/avconv audio quality specification, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K [default: 5] - --recode-video FORMAT Encode the video to another format if necessary + --recode-video=FORMAT Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm) -k --keep-video keeps the video file on disk after the post- processing; the video is erased by default @@ -220,15 +220,14 @@ __license__ = 'Public Domain' import codecs import getpass -#import optparse import os import random import re -import shlex +#import shlex import socket import subprocess import sys -import warnings +#import warnings import platform from .docopt import docopt @@ -243,14 +242,14 @@ from .PostProcessor import * class OptionsError(Exception): pass -def _real_main(argv=None): +def _real_main(): # Compatibility fixes for Windows if sys.platform == 'win32': # https://github.com/rg3/youtube-dl/issues/820 codecs.register(lambda name: codecs.lookup('utf-8') if name == 'cp65001' else None) opts = docopt(__doc__, version=__version__) - raw_input(opts) + print(opts) #--all-formats will supersede --format if opts['--all-formats']: opts['--format'] = 'all' @@ -543,7 +542,7 @@ def _real_main(argv=None): def main(argv=None): try: - _real_main(argv) + _real_main() except DownloadError: sys.exit(1) except SameFileError: