commit c6c19746722e5ef43375f9be0d4de30648697643
parent a545d1d2625081ab92a5223efdd42c1fddb87b58
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 25 Jun 2013 22:22:32 +0200
Add "--video-password" option (related #889)
Used only for accessing a private video
Restore the error when the account is missing
Diffstat:
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -46,6 +46,7 @@ class YoutubeDL(object):
username: Username for authentication purposes.
password: Password for authentication purposes.
+ videopassword: Password for acces a video.
usenetrc: Use netrc for authentication instead.
verbose: Print additional info to stdout.
quiet: Do not print messages to stdout.
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
@@ -173,6 +173,8 @@ def parseOpts(overrideArguments=None):
dest='password', metavar='PASSWORD', help='account password')
authentication.add_option('-n', '--netrc',
action='store_true', dest='usenetrc', help='use .netrc authentication data', default=False)
+ authentication.add_option('--video-password',
+ dest='videopassword', metavar='PASSWORD', help='video password (vimeo only)')
video_format.add_option('-f', '--format',
@@ -422,7 +424,7 @@ def _real_main(argv=None):
if opts.usenetrc and (opts.username is not None or opts.password is not None):
parser.error(u'using .netrc conflicts with giving username/password')
if opts.password is not None and opts.username is None:
- sys.stderr.write(u'WARNING: account username missing\n')
+ parser.error(u' account username missing\n')
if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid):
parser.error(u'using output template conflicts with using title, video ID or auto number')
if opts.usetitle and opts.useid:
@@ -499,6 +501,7 @@ def _real_main(argv=None):
'usenetrc': opts.usenetrc,
'username': opts.username,
'password': opts.password,
+ 'videopassword': opts.videopassword,
'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
'forceurl': opts.geturl,
'forcetitle': opts.gettitle,
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
@@ -20,9 +20,9 @@ class VimeoIE(InfoExtractor):
IE_NAME = u'vimeo'
def _verify_video_password(self, url, video_id, webpage):
- password = self._downloader.params.get('password', None)
+ password = self._downloader.params.get('videopassword', None)
if password is None:
- raise ExtractorError(u'This video is protected by a password, use the --password option')
+ raise ExtractorError(u'This video is protected by a password, use the --video-password option')
token = re.search(r'xsrft: \'(.*?)\'', webpage).group(1)
data = compat_urllib_parse.urlencode({'password': password,
'token': token})
