Use a dictionary for storing the subtitles

[youtube-dl.git] / youtube_dl / extractor / exfm.py

diff --git a/youtube_dl/extractor/exfm.py b/youtube_dl/extractor/exfm.py
index 777bc4dced681cdac5b27bfef468d4b90874615c..fe1582d1a60d6a906d90be4e5d4bae0334b1fe10 100644 (file)
--- a/youtube_dl/extractor/exfm.py
+++ b/youtube_dl/extractor/exfm.py
@@ -1,11 +1,12 @@
 import re
 import json
-import time
 
 from .common import InfoExtractor
 
 
 class ExfmIE(InfoExtractor):
+    IE_NAME = u'exfm'
+    IE_DESC = u'ex.fm'
     _VALID_URL = r'(?:http://)?(?:www\.)?ex\.fm/song/([^/]+)'
     _SOUNDCLOUD_URL_ = r'(?:http://)?(?:www\.)?api\.soundcloud.com/tracks/([^/]+)/stream'
     _TEST = {
@@ -21,9 +22,9 @@ class ExfmIE(InfoExtractor):
 
     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:
@@ -31,7 +32,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'],