fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[exfm] Modernize

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-02-10 20:58:34 +01:00
parent 85409a0c69
commit af6ba6a1c4
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
youtube_dl/extractor/exfm.py
View File

@ -1,56 +1,58 @@
from __future__ import unicode_literals
import re import re
import json
from .common import InfoExtractor from .common import InfoExtractor
class ExfmIE(InfoExtractor): class ExfmIE(InfoExtractor):
IE_NAME = u'exfm' IE_NAME = 'exfm'
IE_DESC = u'ex.fm' IE_DESC = 'ex.fm'
_VALID_URL = r'(?:http://)?(?:www\.)?ex\.fm/song/([^/]+)' _VALID_URL = r'http://(?:www\.)?ex\.fm/song/(?P<id>[^/]+)'
_SOUNDCLOUD_URL = r'(?:http://)?(?:www\.)?api\.soundcloud\.com/tracks/([^/]+)/stream' _SOUNDCLOUD_URL = r'http://(?:www\.)?api\.soundcloud\.com/tracks/([^/]+)/stream'
_TESTS = [ _TESTS = [
{ {
u'url': u'http://ex.fm/song/eh359', 'url': 'http://ex.fm/song/eh359',
u'file': u'44216187.mp3', 'md5': 'e45513df5631e6d760970b14cc0c11e7',
u'md5': u'e45513df5631e6d760970b14cc0c11e7', 'info_dict': {
u'info_dict': { 'id': '44216187',
u"title": u"Test House \"Love Is Not Enough\" (Extended Mix) DeadJournalist Exclusive", 'ext': 'mp3',
u"uploader": u"deadjournalist", 'title': 'Test House "Love Is Not Enough" (Extended Mix) DeadJournalist Exclusive',
u'upload_date': u'20120424', 'uploader': 'deadjournalist',
u'description': u'Test House \"Love Is Not Enough\" (Extended Mix) DeadJournalist Exclusive', 'upload_date': '20120424',
'description': 'Test House \"Love Is Not Enough\" (Extended Mix) DeadJournalist Exclusive',
}, },
u'note': u'Soundcloud song', 'note': 'Soundcloud song',
u'skip': u'The site is down too often', 'skip': 'The site is down too often',
}, },
{ {
u'url': u'http://ex.fm/song/wddt8', 'url': 'http://ex.fm/song/wddt8',
u'file': u'wddt8.mp3', 'md5': '966bd70741ac5b8570d8e45bfaed3643',
u'md5': u'966bd70741ac5b8570d8e45bfaed3643', 'info_dict': {
u'info_dict': { 'id': 'wddt8',
u'title': u'Safe and Sound', 'ext': 'mp3',
u'uploader': u'Capital Cities', 'title': 'Safe and Sound',
'uploader': 'Capital Cities',
}, },
u'skip': u'The site is down too often', 'skip': 'The site is down too often',
}, },
] ]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
song_id = mobj.group(1) song_id = mobj.group('id')
info_url = "http://ex.fm/api/v3/song/%s" %(song_id) info_url = "http://ex.fm/api/v3/song/%s" % song_id
webpage = self._download_webpage(info_url, song_id) info = self._download_json(info_url, song_id)['song']
info = json.loads(webpage) song_url = info['url']
song_url = info['song']['url']
if re.match(self._SOUNDCLOUD_URL, song_url) is not None: if re.match(self._SOUNDCLOUD_URL, song_url) is not None:
self.to_screen('Soundcloud song detected') self.to_screen('Soundcloud song detected')
return self.url_result(song_url.replace('/stream',''), 'Soundcloud') return self.url_result(song_url.replace('/stream', ''), 'Soundcloud')
return [{ return {
'id': song_id, 'id': song_id,
'url': song_url, 'url': song_url,
'ext': 'mp3', 'ext': 'mp3',
'title': info['song']['title'], 'title': info['title'],
'thumbnail': info['song']['image']['large'], 'thumbnail': info['image']['large'],
'uploader': info['song']['artist'], 'uploader': info['artist'],
'view_count': info['song']['loved_count'], 'view_count': info['loved_count'],
}] }