From: M.Yasoob Khalid Date: Thu, 18 Jul 2013 07:37:02 +0000 (+0500) Subject: corrected a typo and added myself to travis notifications. X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=233ad24ecf99e5a44541536e3d3352f6f7ebb526;p=youtube-dl corrected a typo and added myself to travis notifications. --- diff --git a/.travis.yml b/.travis.yml index 7f1fa8a3c..45b71f11b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ notifications: - filippo.valsorda@gmail.com - phihag@phihag.de - jaime.marquinez.ferrandiz+travis@gmail.com + - yasoob.khld@gmail.com # irc: # channels: # - "irc.freenode.org#youtube-dl" diff --git a/youtube_dl/extractor/exfm.py b/youtube_dl/extractor/exfm.py index 777bc4dce..0a80638d3 100644 --- a/youtube_dl/extractor/exfm.py +++ b/youtube_dl/extractor/exfm.py @@ -21,9 +21,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 +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'],