瀏覽代碼

[gamekings] Stricter checks

Yen Chi Hsuan 9 年之前
父節點
當前提交
0e1b1a011d
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      youtube_dl/extractor/gamekings.py

+ 3 - 2
youtube_dl/extractor/gamekings.py

@@ -6,6 +6,7 @@ from ..utils import (
     xpath_text,
     xpath_text,
     xpath_with_ns,
     xpath_with_ns,
 )
 )
+from .youtube import YoutubeIE
 
 
 
 
 class GamekingsIE(InfoExtractor):
 class GamekingsIE(InfoExtractor):
@@ -47,10 +48,10 @@ class GamekingsIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
         webpage = self._download_webpage(url, video_id)
 
 
         playlist_id = self._search_regex(
         playlist_id = self._search_regex(
-            r'gogoVideo\(.*,\s*"([^"]+)', webpage, 'playlist id')
+            r'gogoVideo\([^,]+,\s*"([^"]+)', webpage, 'playlist id')
 
 
         # Check if a YouTube embed is used
         # Check if a YouTube embed is used
-        if playlist_id.find('youtube') != -1:
+        if YoutubeIE.suitable(playlist_id):
             return self.url_result(playlist_id, ie='Youtube')
             return self.url_result(playlist_id, ie='Youtube')
 
 
         playlist = self._download_xml(
         playlist = self._download_xml(