Add "--video-password" option (related #889)

Used only for accessing a private video

Restore the error when the account is missing

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 52ee8cedbc0ddbe4b3b78286132e8e813f363805..b4a966b7035d322173b8595b5a30141ae7299b34 100644 (file)
--- 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
index cdc4a696233a5f941164466b36372af0c1ee6f89..2acaab66859c3a268083ee738fbf6ea9d8c518f0 100644 (file)
--- 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
index 677cf4e1c46c7e08ad1c72ac300d4e83c8229a64..20dc255d4c3e8de8dd4dd4cc30a60cb0427135de 100644 (file)
--- 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})