瀏覽代碼

[generic] Support YouTube swf embed (Fixes #2010)

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

+ 5 - 2
youtube_dl/extractor/generic.py

@@ -233,8 +233,11 @@ class GenericIE(InfoExtractor):
             return self.url_result(surl, 'Vimeo')
             return self.url_result(surl, 'Vimeo')
 
 
         # Look for embedded YouTube player
         # Look for embedded YouTube player
-        matches = re.findall(
-            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?youtube\.com/embed/.+?)\1', webpage)
+        matches = re.findall(r'''(?x)
+            (?:<iframe[^>]+?src=|embedSWF\(\s*)
+            (["\'])(?P<url>(?:https?:)?//(?:www\.)?youtube\.com/
+                (?:embed|v)/.+?)
+            \1''', webpage)
         if matches:
         if matches:
             urlrs = [self.url_result(unescapeHTML(tuppl[1]), 'Youtube')
             urlrs = [self.url_result(unescapeHTML(tuppl[1]), 'Youtube')
                      for tuppl in matches]
                      for tuppl in matches]