projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit @TRox1972 for tosh.cc (#9566) and localnews8 (#9539)
[youtube-dl]
/
youtube_dl
/
extractor
/
gamekings.py
diff --git
a/youtube_dl/extractor/gamekings.py
b/youtube_dl/extractor/gamekings.py
index efe31c10db3a2adedcf63ef51c907ecd68531df5..cbcddcb7cd116a05a8b294c06988586aec955c51 100644
(file)
--- a/
youtube_dl/extractor/gamekings.py
+++ b/
youtube_dl/extractor/gamekings.py
@@
-6,14
+6,15
@@
from ..utils import (
xpath_text,
xpath_with_ns,
)
xpath_text,
xpath_with_ns,
)
+from .youtube import YoutubeIE
class GamekingsIE(InfoExtractor):
class GamekingsIE(InfoExtractor):
- _VALID_URL = r'http://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?
://www\.gamekings\.nl/(?:videos|nieuws)/(?P<id>[^/]+)'
_TESTS = [{
_TESTS = [{
+ # YouTube embed video
'url': 'http://www.gamekings.nl/videos/phoenix-wright-ace-attorney-dual-destinies-review/',
'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',
'info_dict': {
'id': 'HkSQKetlGOU',
'ext': 'mp4',
@@
-24,6
+25,7
@@
class GamekingsIE(InfoExtractor):
'uploader': 'Gamekings Vault',
'upload_date': '20151123',
},
'uploader': 'Gamekings Vault',
'upload_date': '20151123',
},
+ 'add_ie': ['Youtube'],
}, {
# vimeo video
'url': 'http://www.gamekings.nl/videos/the-legend-of-zelda-majoras-mask/',
}, {
# 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(
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
# 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(
return self.url_result(playlist_id, ie='Youtube')
playlist = self._download_xml(