gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[tapely] Catch SoundCloud tracks

Browse source
This commit is contained in:
Naglis Jonaitis 2014-10-01 21:53:45 +03:00
parent 1414df5ce2
commit 9e77c60c9a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/tapely.py
View file

@ -17,6 +17,7 @@ class TapelyIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tape\.ly/(?P<id>[A-Za-z0-9\-_]+)(?:/(?P<songnr>\d+))?' _VALID_URL = r'https?://(?:www\.)?tape\.ly/(?P<id>[A-Za-z0-9\-_]+)(?:/(?P<songnr>\d+))?'
_API_URL = 'http://tape.ly/showtape?id={0:}' _API_URL = 'http://tape.ly/showtape?id={0:}'
_S3_SONG_URL = 'http://mytape.s3.amazonaws.com/{0:}' _S3_SONG_URL = 'http://mytape.s3.amazonaws.com/{0:}'
_SOUNDCLOUD_SONG_URL = 'http://api.soundcloud.com{0:}'
_TESTS = [ _TESTS = [
{ {
'url': 'http://tape.ly/my-grief-as-told-by-water', 'url': 'http://tape.ly/my-grief-as-told-by-water',
@ -68,9 +69,15 @@ class TapelyIE(InfoExtractor):
}) })
entries.append(entry) entries.append(entry)
elif song['source'] == 'YT': elif song['source'] == 'YT':
_, _, yt_id = song['filename'].split('/') self.to_screen('YouTube video detected')
yt_id = song['filename'].replace('/youtube/', '')
entry.update(self.url_result(yt_id, 'Youtube', video_id=yt_id)) entry.update(self.url_result(yt_id, 'Youtube', video_id=yt_id))
entries.append(entry) entries.append(entry)
elif song['source'] == 'SC':
self.to_screen('SoundCloud song detected')
sc_url = self._SOUNDCLOUD_SONG_URL.format(song['filename'])
entry.update(self.url_result(sc_url, 'Soundcloud'))
entries.append(entry)
else: else:
self.report_warning('Unknown song source: %s' % song['source']) self.report_warning('Unknown song source: %s' % song['source'])