projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea14422
)
[hypem] Modernize
author
Sergey M․
<dstftw@gmail.com>
Sat, 5 Dec 2015 14:46:57 +0000
(20:46 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 5 Dec 2015 14:46:57 +0000
(20:46 +0600)
youtube_dl/extractor/hypem.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/hypem.py
b/youtube_dl/extractor/hypem.py
index c8a74bfc74028aa2dc166bfc51b753b488c2ffab..b3706fe6d6cd8dfabb8d8b614baf1a6e12ea75d9 100644
(file)
--- a/
youtube_dl/extractor/hypem.py
+++ b/
youtube_dl/extractor/hypem.py
@@
-28,14
+28,12
@@
class HypemIE(InfoExtractor):
track_id = self._match_id(url)
data = {'ax': 1, 'ts': time.time()}
track_id = self._match_id(url)
data = {'ax': 1, 'ts': time.time()}
- data_encoded = compat_urllib_parse.urlencode(data)
- complete_url = url + "?" + data_encoded
- request = sanitized_Request(complete_url)
+ request = sanitized_Request(url + '?' + compat_urllib_parse.urlencode(data))
response, urlh = self._download_webpage_handle(
request, track_id, 'Downloading webpage with the url')
html_tracks = self._html_search_regex(
response, urlh = self._download_webpage_handle(
request, track_id, 'Downloading webpage with the url')
html_tracks = self._html_search_regex(
- r'(?ms)<script type="application/json" id="displayList-data">
\s*(.*?)\s*
</script>',
+ r'(?ms)<script type="application/json" id="displayList-data">
(.+?)
</script>',
response, 'tracks')
try:
track_list = json.loads(html_tracks)
response, 'tracks')
try:
track_list = json.loads(html_tracks)
@@
-45,14
+43,14
@@
class HypemIE(InfoExtractor):
key = track['key']
track_id = track['id']
key = track['key']
track_id = track['id']
- artist = track['artist']
title = track['song']
title = track['song']
- serve_url = "http://hypem.com/serve/source/%s/%s" % (track_id, key)
request = sanitized_Request(
request = sanitized_Request(
- serve_url, '', {'Content-Type': 'application/json'})
+ 'http://hypem.com/serve/source/%s/%s' % (track_id, key),
+ '', {'Content-Type': 'application/json'})
song_data = self._download_json(request, track_id, 'Downloading metadata')
song_data = self._download_json(request, track_id, 'Downloading metadata')
- final_url = song_data["url"]
+ final_url = song_data['url']
+ artist = track.get('artist')
return {
'id': track_id,
return {
'id': track_id,