diff options
| author | rrooij <rderooij685@gmail.com> | 2016-01-31 00:12:45 +0100 |
|---|---|---|
| committer | rrooij <rderooij685@gmail.com> | 2016-01-31 00:20:46 +0100 |
| commit | ce5879fa1475d9b0a74bd4e644ea944083177b2d (patch) | |
| tree | 3d261bcd9421b45da9805db40027ca09f0bac4c7 | |
| parent | 14823decf3f27d5e7f17abf85444575f7600f4e4 (diff) | |
[Gamekings] Fix viewing of old videos
Some old videos that aren't on Vimeo are being uploaded to YouTube under the
'Gamekings Vault' channel. They use YouTube now for some videos as video
hosting instead of Vimeo or their own hosting. The first test failed to
succeed under the existing code, but works now by using the YouTube
extractor.
The Regex is changed to find the new gogoVideo JavaScript line with the
YouTube embed. Checking if there is a YouTube embed is done by a String
find, which is probably not the best method of checking this.
| -rw-r--r-- | youtube_dl/extractor/gamekings.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/youtube_dl/extractor/gamekings.py b/youtube_dl/extractor/gamekings.py index e7747a3ae..efe31c10d 100644 --- 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': { - 'id': 'phoenix-wright-ace-attorney-dual-destinies-review', + 'id': 'HkSQKetlGOU', '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$', + 'uploader_id': 'UCJugRGo4STYMeFr5RoOShtQ', + 'uploader': 'Gamekings Vault', + 'upload_date': '20151123', }, }, { # vimeo video @@ -43,7 +46,11 @@ class GamekingsIE(InfoExtractor): 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, |