summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-12-05 20:46:57 +0600
committerSergey M․ <dstftw@gmail.com>2015-12-05 20:46:57 +0600
commit960e0388869a0cb383ee86fa01dce6cc8abc380a (patch)
tree302e0d7c7148aff551f6acfb1fd0ddb2426fc4ea
parentea14422ff12a5184794880befe50f1cac4686ea6 (diff)
downloadyoutube-dl-960e0388869a0cb383ee86fa01dce6cc8abc380a.tar.gz
youtube-dl-960e0388869a0cb383ee86fa01dce6cc8abc380a.tar.xz
youtube-dl-960e0388869a0cb383ee86fa01dce6cc8abc380a.zip
[hypem] Modernize
-rw-r--r--youtube_dl/extractor/hypem.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/youtube_dl/extractor/hypem.py b/youtube_dl/extractor/hypem.py
index c8a74bfc7..b3706fe6d 100644
--- 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()}
-        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(
-            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)
@@ -45,14 +43,14 @@ class HypemIE(InfoExtractor):
 
         key = track['key']
         track_id = track['id']
-        artist = track['artist']
         title = track['song']
 
-        serve_url = "http://hypem.com/serve/source/%s/%s" % (track_id, key)
         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')
-        final_url = song_data["url"]
+        final_url = song_data['url']
+        artist = track.get('artist')
 
         return {
             'id': track_id,