X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fexfm.py;h=0a80638d3751d7e9749a9b68568e6a6e7e47d2ee;hb=233ad24ecf99e5a44541536e3d3352f6f7ebb526;hp=cc0758b96d0ded16de375638dc9c11e72b17bb85;hpb=b6ef4029055fdb5c6b27ac0d82d365475f84f32d;p=youtube-dl

diff --git a/youtube_dl/extractor/exfm.py b/youtube_dl/extractor/exfm.py
index cc0758b96..0a80638d3 100644
--- a/youtube_dl/extractor/exfm.py
+++ b/youtube_dl/extractor/exfm.py
@@ -8,12 +8,22 @@ from .common import InfoExtractor
 class ExfmIE(InfoExtractor):
     _VALID_URL = r'(?:http://)?(?:www\.)?ex\.fm/song/([^/]+)'
     _SOUNDCLOUD_URL_ = r'(?:http://)?(?:www\.)?api\.soundcloud.com/tracks/([^/]+)/stream'
+    _TEST = {
+        u'url': u'http://ex.fm/song/1bgtzg',
+        u'file': u'1bgtzg.mp3',
+        u'md5': u'8a7967a3fef10e59a1d6f86240fd41cf',
+        u'info_dict': {
+            u"title": u"We Can't Stop",
+            u"uploader": u"Miley Cyrus",
+            u'thumbnail': u'http://i1.sndcdn.com/artworks-000049666230-w9i7ef-t500x500.jpg?9d68d37'
+        }
+    }
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group(1)
-        info_url = "http://ex.fm/api/v3/song/%s" %(video_id)
-        webpage = self._download_webpage(info_url, video_id)
+        song_id = mobj.group(1)
+        info_url = "http://ex.fm/api/v3/song/%s" %(song_id)
+        webpage = self._download_webpage(info_url, song_id)
         info = json.loads(webpage)
         song_url = re.match(self._SOUNDCLOUD_URL_,info['song']['url'])
         if song_url is not None:
@@ -21,7 +31,7 @@ class ExfmIE(InfoExtractor):
         else:
         	song_url = info['song']['url']
         return [{
-            'id':          video_id,
+            'id':          song_id,
             'url':         song_url,
             'ext':         'mp3',
             'title':       info['song']['title'],