projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
karaoketv.py
diff --git
a/youtube_dl/extractor/karaoketv.py
b/youtube_dl/extractor/karaoketv.py
index 4d50308cc44de26269eb9727203c8662c857df7c..06daf5a89ce3ffde4d71d7dc8ceee9441840b72b 100644
(file)
--- a/
youtube_dl/extractor/karaoketv.py
+++ b/
youtube_dl/extractor/karaoketv.py
@@
-1,12
+1,11
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import re
-import json
-import sys
-
from .common import InfoExtractor
from .common import InfoExtractor
-from ..utils import compat_urllib_parse, ExtractorError
+from ..compat import compat_urllib_parse_unquote_plus
+from ..utils import (
+ js_to_json,
+)
class KaraoketvIE(InfoExtractor):
class KaraoketvIE(InfoExtractor):
@@
-21,22
+20,16
@@
class KaraoketvIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
-
- # BUG: SSL23_GET_SERVER_HELLO:unknown protocol
- if sys.hexversion < 0x03000000:
- raise ExtractorError("Only python 3 supported.\n")
-
- mobj = re.match(self._VALID_URL, url)
-
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
-
settings_json = compat_urllib_parse.unquote_plus(self._search_regex(r'config=(.*)', self._og_search_video_url(webpage ,video_id), '')
)
-
-
urls_info_webpage = self._download_webpage(settings_json, 'Downloading settings json'
)
+
page_video_url = self._og_search_video_url(webpage, video_id
)
+ config_json = compat_urllib_parse_unquote_plus(self._search_regex(
+
r'config=(.*)', page_video_url, 'configuration')
)
- urls_info_json = json.loads(urls_info_webpage.replace('\'', '"'))
+ urls_info_json = self._download_json(
+ config_json, video_id, 'Downloading configuration',
+ transform_source=js_to_json)
url = urls_info_json['playlist'][0]['url']
url = urls_info_json['playlist'][0]['url']
@@
-44,4
+37,4
@@
class KaraoketvIE(InfoExtractor):
'id': video_id,
'title': self._og_search_title(webpage),
'url': url,
'id': video_id,
'title': self._og_search_title(webpage),
'url': url,
- }
\ No newline at end of file
+ }