projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Gamekings] Fix viewing of old videos
[youtube-dl]
/
youtube_dl
/
extractor
/
gamekings.py
diff --git
a/youtube_dl/extractor/gamekings.py
b/youtube_dl/extractor/gamekings.py
index e7747a3aee19b32c630a8aaf234f0e0340506312..efe31c10db3a2adedcf63ef51c907ecd68531df5 100644
(file)
--- a/
youtube_dl/extractor/gamekings.py
+++ b/
youtube_dl/extractor/gamekings.py
@@
-15,11
+15,14
@@
class GamekingsIE(InfoExtractor):
# MD5 is flaky, seems to change regularly
# 'md5': '2f32b1f7b80fdc5cb616efb4f387f8a3',
'info_dict': {
# MD5 is flaky, seems to change regularly
# 'md5': '2f32b1f7b80fdc5cb616efb4f387f8a3',
'info_dict': {
- 'id': '
phoenix-wright-ace-attorney-dual-destinies-review
',
+ 'id': '
HkSQKetlGOU
',
'ext': 'mp4',
'ext': 'mp4',
- 'title': 'Phoenix Wright: Ace Attorney
\u2013
Dual Destinies Review',
- 'description': 'md5:
36fd701e57e8c15ac8682a2374c99731
',
+ 'title': 'Phoenix Wright: Ace Attorney
-
Dual Destinies Review',
+ 'description': 'md5:
db88c0e7f47e9ea50df3271b9dc72e1d
',
'thumbnail': 're:^https?://.*\.jpg$',
'thumbnail': 're:^https?://.*\.jpg$',
+ 'uploader_id': 'UCJugRGo4STYMeFr5RoOShtQ',
+ 'uploader': 'Gamekings Vault',
+ 'upload_date': '20151123',
},
}, {
# vimeo video
},
}, {
# vimeo video
@@
-43,7
+46,11
@@
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*\d+\s*,\s*"([^"]+)', webpage, 'playlist id')
+ r'gogoVideo\(.*,\s*"([^"]+)', webpage, 'playlist id')
+
+ # Check if a YouTube embed is used
+ if playlist_id.find('youtube') != -1:
+ return self.url_result(playlist_id, ie='Youtube')
playlist = self._download_xml(
'http://www.gamekings.tv/wp-content/themes/gk2010/rss_playlist.php?id=%s' % playlist_id,
playlist = self._download_xml(
'http://www.gamekings.tv/wp-content/themes/gk2010/rss_playlist.php?id=%s' % playlist_id,