X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgamekings.py;h=cbcddcb7cd116a05a8b294c06988586aec955c51;hb=369ff750812ff874a0f4b4ceebb15a024e2f0a9d;hp=efe31c10db3a2adedcf63ef51c907ecd68531df5;hpb=ce5879fa1475d9b0a74bd4e644ea944083177b2d;p=youtube-dl

diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py
index efe31c10d..cbcddcb7c 100644
--- a/youtube_dl/extractor/gamekings.py
+++ b/youtube_dl/extractor/gamekings.py
@@ -6,14 +6,15 @@ from ..utils import (
     xpath_text,
     xpath_with_ns,
 )
+from .youtube import YoutubeIE
 
 
 class GamekingsIE(InfoExtractor):
-    _VALID_URL = r'http://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
     _TESTS = [{
+        # YouTube embed video
         'url': 'http://www.gamekings.nl/videos/phoenix-wright-ace-attorney-dual-destinies-review/',
-        # MD5 is flaky, seems to change regularly
-        # 'md5': '2f32b1f7b80fdc5cb616efb4f387f8a3',
+        'md5': '5208d3a17adeaef829a7861887cb9029',
         'info_dict': {
             'id': 'HkSQKetlGOU',
             'ext': 'mp4',
@@ -24,6 +25,7 @@ class GamekingsIE(InfoExtractor):
             'uploader': 'Gamekings Vault',
             'upload_date': '20151123',
         },
+        'add_ie': ['Youtube'],
     }, {
         # vimeo video
         'url': 'http://www.gamekings.nl/videos/the-legend-of-zelda-majoras-mask/',
@@ -46,10 +48,10 @@ class GamekingsIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         playlist_id = self._search_regex(
-            r'gogoVideo\(.*,\s*"([^"]+)', webpage, 'playlist id')
+            r'gogoVideo\([^,]+,\s*"([^"]+)', webpage, 'playlist id')
 
         # 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')
 
         playlist = self._download_xml(