X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgamekings.py;h=cbcddcb7cd116a05a8b294c06988586aec955c51;hb=ffa2cecf7291a7b9aa40dba84a76c71fba20cc57;hp=df385e338f6f7a9cfcb4541f6c088b5e266f091f;hpb=eab3c2895c66a8d2f5da181d3ccba35a901b813f;p=youtube-dl diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index df385e338..cbcddcb7c 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -6,10 +6,11 @@ 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/', @@ -47,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(