aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-09-01 23:32:28 +0700
committerSergey M․ <dstftw@gmail.com>2016-09-01 23:32:28 +0700
commit8fb6af6bba201c9f750aadb7b092704195c7f8e0 (patch)
tree72009d3ae9654dc3b4f60f08c63a6671cc61e813
parentf6af0f888b03e8c072b86c04492cc84c966c9f15 (diff)
downloadyoutube-dl-8fb6af6bba201c9f750aadb7b092704195c7f8e0.tar.xz
[exfm] Remove extractor (Closes #10482)
-rw-r--r--youtube_dl/extractor/exfm.py58
-rw-r--r--youtube_dl/extractor/extractors.py1
2 files changed, 0 insertions, 59 deletions
diff --git a/youtube_dl/extractor/exfm.py b/youtube_dl/extractor/exfm.py
deleted file mode 100644
index 09ed4f2b5..000000000
--- a/youtube_dl/extractor/exfm.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-
-
-class ExfmIE(InfoExtractor):
- IE_NAME = 'exfm'
- IE_DESC = 'ex.fm'
- _VALID_URL = r'https?://(?:www\.)?ex\.fm/song/(?P<id>[^/]+)'
- _SOUNDCLOUD_URL = r'http://(?:www\.)?api\.soundcloud\.com/tracks/([^/]+)/stream'
- _TESTS = [
- {
- 'url': 'http://ex.fm/song/eh359',
- 'md5': 'e45513df5631e6d760970b14cc0c11e7',
- 'info_dict': {
- 'id': '44216187',
- 'ext': 'mp3',
- 'title': 'Test House "Love Is Not Enough" (Extended Mix) DeadJournalist Exclusive',
- 'uploader': 'deadjournalist',
- 'upload_date': '20120424',
- 'description': 'Test House \"Love Is Not Enough\" (Extended Mix) DeadJournalist Exclusive',
- },
- 'note': 'Soundcloud song',
- 'skip': 'The site is down too often',
- },
- {
- 'url': 'http://ex.fm/song/wddt8',
- 'md5': '966bd70741ac5b8570d8e45bfaed3643',
- 'info_dict': {
- 'id': 'wddt8',
- 'ext': 'mp3',
- 'title': 'Safe and Sound',
- 'uploader': 'Capital Cities',
- },
- 'skip': 'The site is down too often',
- },
- ]
-
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- song_id = mobj.group('id')
- info_url = 'http://ex.fm/api/v3/song/%s' % song_id
- info = self._download_json(info_url, song_id)['song']
- song_url = info['url']
- if re.match(self._SOUNDCLOUD_URL, song_url) is not None:
- self.to_screen('Soundcloud song detected')
- return self.url_result(song_url.replace('/stream', ''), 'Soundcloud')
- return {
- 'id': song_id,
- 'url': song_url,
- 'ext': 'mp3',
- 'title': info['title'],
- 'thumbnail': info['image']['large'],
- 'uploader': info['artist'],
- 'view_count': info['loved_count'],
- }
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 0c2436b67..7b59d5db2 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -261,7 +261,6 @@ from .espn import ESPNIE
from .esri import EsriVideoIE
from .europa import EuropaIE
from .everyonesmixtape import EveryonesMixtapeIE
-from .exfm import ExfmIE
from .expotv import ExpoTVIE
from .extremetube import ExtremeTubeIE
from .eyedotv import EyedoTVIE