From eb9b5bffef9d247bba4f2e8d387ddfbc47ece77b Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 13 Nov 2013 10:30:41 +0100 Subject: Add extractor for gamekings.tv --- youtube_dl/extractor/gamekings.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 youtube_dl/extractor/gamekings.py (limited to 'youtube_dl/extractor/gamekings.py') diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py new file mode 100644 index 000000000..eca71ab05 --- /dev/null +++ b/youtube_dl/extractor/gamekings.py @@ -0,0 +1,39 @@ +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\-])' + _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', + 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.", + } + } + + def _real_extract(self, url): + + 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 = re.search(r'[0-9]+',gamekings_url) + video_id = video.group(0) + + # Todo: add medium format + gamekings_url = gamekings_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), + } -- cgit v1.2.3 From 384b98cd8f90ef2ac25c1f4f20ba9385adabaca8 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 13 Nov 2013 10:50:53 +0100 Subject: [gamekings] Minor fixes (#1759) --- youtube_dl/extractor/gamekings.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'youtube_dl/extractor/gamekings.py') diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index eca71ab05..4b4259447 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -7,13 +7,13 @@ from ..utils import ( 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', + u'file': u'20130811.mp4', + u'md5': u'17f6088f7d0149ff2b46f2714bdb1954', u'info_dict': { - u"title": u"Phoenix Wright: Ace Attorney – Dual Destinies Review", + u"title": u"Phoenix Wright: Ace Attorney \u2013 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.", } } @@ -23,17 +23,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), + } -- cgit v1.2.3 From ea7a7af1d46ecb51566db0af3e8779ab2a04b516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Wed, 13 Nov 2013 17:13:06 +0100 Subject: [gamekings] Fix the test video checksum --- youtube_dl/extractor/gamekings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/extractor/gamekings.py') diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index 4b4259447..6aa657ef4 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -11,7 +11,7 @@ class GamekingsIE(InfoExtractor): _TEST = { u"url": u"http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/", u'file': u'20130811.mp4', - u'md5': u'17f6088f7d0149ff2b46f2714bdb1954', + u'md5': u'2f32b1f7b80fdc5cb616efb4f387f8a3', u'info_dict': { u"title": u"Phoenix Wright: Ace Attorney \u2013 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.", -- cgit v1.2.3 From 21ea3e06c9e39ac2cbfa24e7c02ebac936202893 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 16 Nov 2013 02:31:02 +0100 Subject: [gamekings] remove unnecessary import --- youtube_dl/extractor/gamekings.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'youtube_dl/extractor/gamekings.py') diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index 6aa657ef4..64715581d 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -1,9 +1,6 @@ import re from .common import InfoExtractor -from ..utils import ( - determine_ext, -) class GamekingsIE(InfoExtractor): -- cgit v1.2.3 From eab2724138670159f1946608359f5e5bd5a7e7af Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sat, 16 Nov 2013 02:32:08 +0100 Subject: [gamekings] Do not test md5 sum, precise file changes regularly --- youtube_dl/extractor/gamekings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'youtube_dl/extractor/gamekings.py') diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index 64715581d..c91669b0e 100644 --- a/youtube_dl/extractor/gamekings.py +++ b/youtube_dl/extractor/gamekings.py @@ -8,7 +8,8 @@ class GamekingsIE(InfoExtractor): _TEST = { u"url": u"http://www.gamekings.tv/videos/phoenix-wright-ace-attorney-dual-destinies-review/", u'file': u'20130811.mp4', - u'md5': u'2f32b1f7b80fdc5cb616efb4f387f8a3', + # MD5 is flaky, seems to change regularly + #u'md5': u'2f32b1f7b80fdc5cb616efb4f387f8a3', u'info_dict': { u"title": u"Phoenix Wright: Ace Attorney \u2013 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.", -- cgit v1.2.3