- mobj = re.match(self._VALID_URL, url)
- music_id = mobj.group('id')
- webpage = self._download_webpage(url, music_id)
-
- title = self._html_search_regex(r',"name":"([^"]+)",', webpage, 'music title', flags=re.DOTALL)
- uploader = self._html_search_regex(r',"artist":"([^"]+)",', webpage, 'music uploader', flags=re.DOTALL)
-
- music_url_json_string = '{"url":"' + self._html_search_regex(r'{"url":"([^"]+)",', webpage, 'music url', flags=re.DOTALL) + '"}'
- music_url_json = json.loads(music_url_json_string)
- music_url = music_url_json['url']
-
- return [{
- 'id': music_id,
- 'title': title,
- 'url': music_url,
+ media_id = self._match_id(url)
+ webpage = self._download_webpage(url, media_id)
+
+ title = self._html_search_regex(
+ r'<title>([^>]+)</title>', webpage, 'title')
+
+ uploader = self._html_search_regex(
+ r'Author\s*<a[^>]+>([^<]+)', webpage, 'uploader', fatal=False)
+
+ music_url = self._parse_json(self._search_regex(
+ r'"url":("[^"]+"),', webpage, ''), media_id)
+
+ return {
+ 'id': media_id,
+ 'title': title,
+ 'url': music_url,