depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-23 02:32:16 +00:00
Code Issues Releases Wiki Activity

style and error handling edits to HypemIE

Browse source
This commit is contained in:
Filippo Valsorda 2013-06-06 12:02:36 +02:00
parent 157b864a01
commit 868d62a509
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
youtube_dl/InfoExtractors.py
View file

@ -4491,44 +4491,43 @@ class HypemIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
raise ExtractorError(u'Invalid URL: %s' % url) raise ExtractorError(u'Invalid URL: %s' % url)
data = {'ax':1 , track_id = mobj.group(1)
'ts': time.time()
} data = { 'ax': 1, 'ts': time.time() }
id = mobj.group(1)
data_encoded = compat_urllib_parse.urlencode(data) data_encoded = compat_urllib_parse.urlencode(data)
complete_url = url + "?" + data_encoded complete_url = url + "?" + data_encoded
request = compat_urllib_request.Request(complete_url) request = compat_urllib_request.Request(complete_url)
response,urlh = self._download_webpage_handle(request, id, u'Downloading webpage with the url') response, urlh = self._download_webpage_handle(request, track_id, u'Downloading webpage with the url')
cookie = urlh.headers.get('Set-Cookie', '') cookie = urlh.headers.get('Set-Cookie', '')
track_list = []
list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',response) self.report_extraction(track_id)
html_tracks = list_data.group(1) mobj = re.search(r'<script type="application/json" id="displayList-data">(.*?)</script>', response, flags=re.MULTILINE|re.DOTALL)
if html_tracks is None: if mobj is None:
tracks = track_list raise ExtractorError(u'Unable to extrack tracks')
html_tracks = mobj.group(1).strip()
try: try:
track_list = json.loads(html_tracks) track_list = json.loads(html_tracks)
tracks = track_list[u'tracks'] track = track_list[u'tracks'][0]
except ValueError: except ValueError:
self.to_screen("Hypemachine contained invalid JSON.") raise ExtractorError(u'Hypemachine contained invalid JSON.')
tracks = track_list
for track in tracks:
key = track[u"key"] key = track[u"key"]
id = track[u"id"] track_id = track[u"id"]
artist = track[u"artist"] artist = track[u"artist"]
title = track[u"song"] title = track[u"song"]
serve_url = "http://hypem.com/serve/source/%s/%s"%(str(id), str(key))
self.report_extraction(id) 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'}) request = compat_urllib_request.Request(serve_url, "" , {'Content-Type': 'application/json'})
request.add_header('cookie', cookie) request.add_header('cookie', cookie)
response = compat_urllib_request.urlopen(request) song_data_json = self._download_webpage(request, track_id, u'Downloading metadata')
song_data_json = response.read() try:
response.close()
(song_data_json, response) = self._download_webpage_handle(request, id, u'Downloading webpage with the url')
song_data = json.loads(song_data_json) song_data = json.loads(song_data_json)
except ValueError:
raise ExtractorError(u'Hypemachine contained invalid JSON.')
final_url = song_data[u"url"] final_url = song_data[u"url"]
return [{ return [{
'id': id, 'id': track_id,
'url': final_url, 'url': final_url,
'ext': "mp3", 'ext': "mp3",
'title': title, 'title': title,