DuckDuckWhale/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-19 07:57:18 +00:00
Code Issues Releases Wiki Activity

[thesixtyone] Fix audio_server

Browse Source 
Some of the songs are moved to Amazon AWS
This commit is contained in:
Yen Chi Hsuan 2015-06-25 16:15:13 +08:00
parent a1593a4a0e
commit 2182ab5187
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/thesixtyone.py
View File

@ -17,7 +17,7 @@ class TheSixtyOneIE(InfoExtractor):
song song
)/(?P<id>[A-Za-z0-9]+)/?$''' )/(?P<id>[A-Za-z0-9]+)/?$'''
_SONG_URL_TEMPLATE = 'http://thesixtyone.com/s/{0:}' _SONG_URL_TEMPLATE = 'http://thesixtyone.com/s/{0:}'
_SONG_FILE_URL_TEMPLATE = 'http://{audio_server:}.thesixtyone.com/thesixtyone_production/audio/{0:}_stream' _SONG_FILE_URL_TEMPLATE = 'http://{audio_server:}/thesixtyone_production/audio/{0:}_stream'
_THUMBNAIL_URL_TEMPLATE = '{photo_base_url:}_desktop' _THUMBNAIL_URL_TEMPLATE = '{photo_base_url:}_desktop'
_TESTS = [ _TESTS = [
{ {
@ -78,6 +78,12 @@ class TheSixtyOneIE(InfoExtractor):
song_data = json.loads(self._search_regex( song_data = json.loads(self._search_regex(
r'"%s":\s(\{.*?\})' % song_id, webpage, 'song_data')) r'"%s":\s(\{.*?\})' % song_id, webpage, 'song_data'))
if self._search_regex(r'(t61\.s3_audio_load\s*=\s*1\.0;)', webpage, 's3_audio_load marker', default=None):
song_data['audio_server'] = 's3.amazonaws.com'
else:
song_data['audio_server'] = song_data['audio_server'] + '.thesixtyone.com'
keys = [self._DECODE_MAP.get(s, s) for s in song_data['key']] keys = [self._DECODE_MAP.get(s, s) for s in song_data['key']]
url = self._SONG_FILE_URL_TEMPLATE.format( url = self._SONG_FILE_URL_TEMPLATE.format(
"".join(reversed(keys)), **song_data) "".join(reversed(keys)), **song_data)