projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ChangeLog] Actualize
[youtube-dl]
/
youtube_dl
/
extractor
/
hypem.py
diff --git
a/youtube_dl/extractor/hypem.py
b/youtube_dl/extractor/hypem.py
index cca3dd4985dd9ce1587852b34e83e0d8f9e27249..f7c9130540e51a75a83052704d61403b488b25f6 100644
(file)
--- a/
youtube_dl/extractor/hypem.py
+++ b/
youtube_dl/extractor/hypem.py
@@
-4,7
+4,7
@@
import json
import time
from .common import InfoExtractor
import time
from .common import InfoExtractor
-from ..compat import compat_urllib_parse
+from ..compat import compat_urllib_parse
_urlencode
from ..utils import (
ExtractorError,
sanitized_Request,
from ..utils import (
ExtractorError,
sanitized_Request,
@@
-12,7
+12,7
@@
from ..utils import (
class HypemIE(InfoExtractor):
class HypemIE(InfoExtractor):
- _VALID_URL = r'http://(?:www\.)?hypem\.com/track/(?P<id>[^/]+)/'
+ _VALID_URL = r'http
s?
://(?:www\.)?hypem\.com/track/(?P<id>[^/]+)/'
_TEST = {
'url': 'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
'md5': 'b9cc91b5af8995e9f0c1cee04c575828',
_TEST = {
'url': 'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
'md5': 'b9cc91b5af8995e9f0c1cee04c575828',
@@
-28,15
+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')
response, urlh = self._download_webpage_handle(
request, track_id, 'Downloading webpage with the url')
- cookie = urlh.headers.get('Set-Cookie', '')
html_tracks = self._html_search_regex(
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)
@@
-46,15
+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'})
-
request.add_header('cookie', cookie
)
+ '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,