From: Jaime Marquínez Ferrándiz Date: Wed, 26 Aug 2015 13:21:55 +0000 (+0200) Subject: [youtube] Adapt player version regex to handle urls ending in '/html5player-new.js' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=4bc8eec4ebf5ffcca3b2e17c864be08df5215f44;p=youtube-dl [youtube] Adapt player version regex to handle urls ending in '/html5player-new.js' It was always extracting 'new' as the version, breaking the cache system. --- 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[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.(?P[a-z]+)$', + r'.*?-(?P[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player(?:-new)?)?\.(?P[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