projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b88fee
)
[hypem] Modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 9 Jun 2014 20:30:57 +0000
(22:30 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 9 Jun 2014 20:34:41 +0000
(22:34 +0200)
youtube_dl/extractor/hypem.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/hypem.py
b/youtube_dl/extractor/hypem.py
index 9bd06e7c7913e9c7492f63417760012f1219c875..6a95da90027e0917e9f431667e6f605dbff93a63 100644
(file)
--- a/
youtube_dl/extractor/hypem.py
+++ b/
youtube_dl/extractor/hypem.py
@@
-1,3
+1,5
@@
+from __future__ import unicode_literals
+
import json
import re
import time
import json
import re
import time
@@
-13,59
+15,55
@@
from ..utils import (
class HypemIE(InfoExtractor):
class HypemIE(InfoExtractor):
- """Information Extractor for hypem"""
- _VALID_URL = r'(?:http://)?(?:www\.)?hypem\.com/track/([^/]+)/([^/]+)'
+ _VALID_URL = r'http://(?:www\.)?hypem\.com/track/([^/]+)/([^/]+)'
_TEST = {
_TEST = {
- u'url': u'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
- u'file': u'1v6ga.mp3',
- u'md5': u'b9cc91b5af8995e9f0c1cee04c575828',
- u'info_dict': {
- u"title": u"Tame"
+ 'url': 'http://hypem.com/track/1v6ga/BODYWORK+-+TAME',
+ 'md5': 'b9cc91b5af8995e9f0c1cee04c575828',
+ 'info_dict': {
+ 'id': '1v6ga',
+ 'ext': 'mp3',
+ 'title': 'Tame',
+ 'uploader': 'BODYWORK',
}
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
}
}
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- if mobj is None:
- raise ExtractorError(u'Invalid URL: %s' % url)
track_id = mobj.group(1)
data = {'ax': 1, 'ts': time.time()}
data_encoded = compat_urllib_parse.urlencode(data)
complete_url = url + "?" + data_encoded
request = compat_urllib_request.Request(complete_url)
track_id = mobj.group(1)
data = {'ax': 1, 'ts': time.time()}
data_encoded = compat_urllib_parse.urlencode(data)
complete_url = url + "?" + data_encoded
request = compat_urllib_request.Request(complete_url)
- response, urlh = self._download_webpage_handle(request, track_id, u'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', '')
cookie = urlh.headers.get('Set-Cookie', '')
- self.report_extraction(track_id)
-
- html_tracks = self._html_search_regex(r'<script type="application/json" id="displayList-data">(.*?)</script>',
- response, u'tracks', flags=re.MULTILINE|re.DOTALL).strip()
+ html_tracks = self._html_search_regex(
+ r'(?ms)<script type="application/json" id="displayList-data">\s*(.*?)\s*</script>',
+ response, 'tracks')
try:
track_list = json.loads(html_tracks)
try:
track_list = json.loads(html_tracks)
- track = track_list[
u
'tracks'][0]
+ track = track_list['tracks'][0]
except ValueError:
except ValueError:
- raise ExtractorError(
u
'Hypemachine contained invalid JSON.')
+ raise ExtractorError('Hypemachine contained invalid JSON.')
- key = track[
u"key"
]
- track_id = track[
u"id"
]
- artist = track[
u"artist"
]
- title = track[
u"song"
]
+ key = track[
'key'
]
+ track_id = track[
'id'
]
+ artist = track[
'artist'
]
+ title = track[
'song'
]
- serve_url = "http://hypem.com/serve/source/%s/%s" % (compat_str(track_id), compat_str(key))
- request = compat_urllib_request.Request(serve_url, "" , {'Content-Type': 'application/json'})
+ serve_url = "http://hypem.com/serve/source/%s/%s" % (track_id, key)
+ request = compat_urllib_request.Request(
+ serve_url, '', {'Content-Type': 'application/json'})
request.add_header('cookie', cookie)
request.add_header('cookie', cookie)
- song_data_json = self._download_webpage(request, track_id, u'Downloading metadata')
- try:
- song_data = json.loads(song_data_json)
- except ValueError:
- raise ExtractorError(u'Hypemachine contained invalid JSON.')
- final_url = song_data[u"url"]
+ song_data = self._download_json(request, track_id, 'Downloading metadata')
+ final_url = song_data["url"]
- return
[
{
- 'id':
track_id,
- 'url':
final_url,
- 'ext':
"mp3"
,
- 'title':
title,
- '
artist':
artist,
- }
]
+ return {
+ 'id': track_id,
+ 'url': final_url,
+ 'ext':
'mp3'
,
+ 'title': title,
+ '
uploader':
artist,
+ }