diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-08-11 01:18:50 +0600 | 
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-08-11 01:18:50 +0600 | 
| commit | 0ff827419e4bd88077df4438953540b0c406107e (patch) | |
| tree | 2657bb711f382e5736ea42a2c14b564733fea56c | |
| parent | b29440aee64027b3e4145070b0235193752b4d9f (diff) | |
| parent | 11b5605815d685263b271b4e061c43f9cb55a08c (diff) | |
Merge pull request #6518 from puckipedia/master
[youtube] Use the first v= argument in the URL
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 19 | 
1 files changed, 18 insertions, 1 deletions
| diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 67a1df9a0..eaf058cfb 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -213,7 +213,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):                               |(?:                                             # or the v= param in all its forms                                   (?:(?:watch|movie)(?:_popup)?(?:\.php)?/?)?  # preceding watch(_popup|.php) or nothing (like /?v=xxxx)                                   (?:\?|\#!?)                                  # the params delimiter ? or # or #! -                                 (?:.*?&)?                                    # any other preceding param (like /?s=tuff&v=xxxx) +                                 (?:.*?&)??                                   # any other preceding param (like /?s=tuff&v=xxxx)                                   v=                               )                           )) @@ -381,6 +381,23 @@ class YoutubeIE(YoutubeBaseInfoExtractor):              }          },          { +            'url': 'http://www.youtube.com/watch?v=BaW_jenozKcj&v=UxxajLWwzqY', +            'note': 'Use the first video ID in the URL', +            'info_dict': { +                'id': 'BaW_jenozKc', +                'ext': 'mp4', +                'title': 'youtube-dl test video "\'/\\ä↭𝕐', +                'uploader': 'Philipp Hagemeister', +                'uploader_id': 'phihag', +                'upload_date': '20121002', +                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .', +                'categories': ['Science & Technology'], +                'tags': ['youtube-dl'], +                'like_count': int, +                'dislike_count': int, +            } +        }, +        {              'url': 'http://www.youtube.com/watch?v=a9LDPn-MO4I',              'note': '256k DASH audio (format 141) via DASH manifest',              'info_dict': { | 
