X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgamekings.py;h=11fee3d31e88833b8074a1b59cff885eeffa46d3;hb=eec4d8ef9639d275b14b60286a414bc26971a4c7;hp=eca71ab0576ed7fd83488d5a35ceb72b8ab64d41;hpb=eb9b5bffef9d247bba4f2e8d387ddfbc47ece77b;p=youtube-dl diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index eca71ab05..11fee3d31 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -1,20 +1,21 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor -from ..utils import ( - determine_ext, -) class GamekingsIE(InfoExtractor): - _VALID_URL = r'http?://www\.gamekings\.tv/videos/(?P[0-9a-z\-])' + _VALID_URL = r'http://www\.gamekings\.tv/videos/(?P[0-9a-z\-]+)' _TEST = { - u"url": u"http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/", - u'file': u'20130811_PhoenixWright.mp4', - u'md5': u'8d42d15381e2dfa81dee86c7956d35ff', + 'url': 'http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/', + # MD5 is flaky, seems to change regularly + # 'md5': '2f32b1f7b80fdc5cb616efb4f387f8a3', u'info_dict': { - u"title": u"Phoenix Wright: Ace Attorney – Dual Destinies Review", - u"description": u"Melle en Steven hebben voor de review een week in de rechtbank doorbracht met Phoenix Wright: Ace Attorney - Dual Destinies.", + 'id': '20130811', + 'ext': 'mp4', + 'title': 'Phoenix Wright: Ace Attorney \u2013 Dual Destinies Review', + 'description': 'md5:36fd701e57e8c15ac8682a2374c99731', } } @@ -23,17 +24,18 @@ class GamekingsIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) name = mobj.group('name') webpage = self._download_webpage(url, name) - gamekings_url = self._og_search_video_url(webpage) + video_url = self._og_search_video_url(webpage) - video = re.search(r'[0-9]+',gamekings_url) + video = re.search(r'[0-9]+', video_url) video_id = video.group(0) - # Todo: add medium format - gamekings_url = gamekings_url.replace(video_id,'large/' + video_id) + # Todo: add medium format + video_url = video_url.replace(video_id, 'large/' + video_id) - return {'id': video_id, - 'ext': 'mp4', - 'url': gamekings_url, - 'title': self._og_search_title(webpage), - 'description': self._og_search_description(webpage), - } + return { + 'id': video_id, + 'ext': 'mp4', + 'url': video_url, + 'title': self._og_search_title(webpage), + 'description': self._og_search_description(webpage), + }