瀏覽代碼

[youtube] Support new player URLs (Fixes #3326)

Philipp Hagemeister 11 年之前
父節點
當前提交
c081b35c27
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      youtube_dl/extractor/youtube.py

+ 3 - 1
youtube_dl/extractor/youtube.py

@@ -346,8 +346,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
 
     def _extract_signature_function(self, video_id, player_url, slen):
         id_m = re.match(
-            r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3)?\.(?P<ext>[a-z]+)$',
+            r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.(?P<ext>[a-z]+)$',
             player_url)
+        if not id_m:
+            raise ExtractorError('Cannot identify player %r' % player_url)
         player_type = id_m.group('ext')
         player_id = id_m.group('id')