diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-08-26 20:17:52 +0600 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-08-26 20:17:52 +0600 |
| commit | 57179b4ca1c40412b891b69baf0f1202a1d4c9a4 (patch) | |
| tree | 437b507e8768805f23825936245e3e90d1eace7d /youtube_dl/extractor | |
| parent | baf510bf8cb296d2ed2a2f742ec9387d094623e6 (diff) | |
| parent | 4bc8eec4ebf5ffcca3b2e17c864be08df5215f44 (diff) | |
| download | youtube-dl-57179b4ca1c40412b891b69baf0f1202a1d4c9a4.tar.xz | |
Merge pull request #6679 from jaimeMF/youtube-fix-player-version-regex
[youtube] Adapt player version regex to handle urls ending in '/html5player-new.js'
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 8e2da46e3..ab6754154 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -660,7 +660,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): def _extract_signature_function(self, video_id, player_url, example_sig): id_m = re.match( - r'.*?-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.(?P<ext>[a-z]+)$', + r'.*?-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player(?:-new)?)?\.(?P<ext>[a-z]+)$', player_url) if not id_m: raise ExtractorError('Cannot identify player %r' % player_url) @@ -1289,7 +1289,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): player_desc = 'flash player %s' % player_version else: player_version = self._search_regex( - r'html5player-([^/]+?)(?:/html5player)?\.js', + r'html5player-([^/]+?)(?:/html5player(?:-new)?)?\.js', player_url, 'html5 player', fatal=False) player_desc = 'html5 player %s' % player_version |