X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgamekings.py;h=cbcddcb7cd116a05a8b294c06988586aec955c51;hb=5886b38d73c54239c85c3e0d8e7c1585d1bbb7da;hp=c011e9d221f4f7cee37480f244991966ebda66f3;hpb=163da6a484f57c52afdf300d368136d164316803;p=youtube-dl diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index c011e9d22..cbcddcb7c 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -6,11 +6,13 @@ 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[^/]+)' + _VALID_URL = r'https?://www\.gamekings\.nl/(?:videos|nieuws)/(?P[^/]+)' _TESTS = [{ + # YouTube embed video 'url': 'http://www.gamekings.nl/videos/phoenix-wright-ace-attorney-dual-destinies-review/', 'md5': '5208d3a17adeaef829a7861887cb9029', 'info_dict': { @@ -23,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/', @@ -45,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(