X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Feighttracks.py;h=fb5dbbe2b0c7d9bd15b87426e446ce73f903a6eb;hb=6f4ba54079893a09c6aa78fe3420523fb96df858;hp=f093592a85da872ca0b206d222e025c08f124dff;hpb=754f0008ec6b87316ce3e4807f150726ff2af3c5;p=youtube-dl diff --git a/youtube_dl/extractor/eighttracks.py b/youtube_dl/extractor/eighttracks.py index f093592a8..fb5dbbe2b 100644 --- a/youtube_dl/extractor/eighttracks.py +++ b/youtube_dl/extractor/eighttracks.py @@ -4,11 +4,12 @@ from __future__ import unicode_literals import json import random import re -import time from .common import InfoExtractor -from ..utils import ( +from ..compat import ( compat_str, +) +from ..utils import ( ExtractorError, ) @@ -115,13 +116,12 @@ class EightTracksIE(InfoExtractor): mix_id = data['id'] track_count = data['tracks_count'] duration = data['duration'] - avg_song_duration = duration / track_count + avg_song_duration = float(duration) / track_count first_url = 'http://8tracks.com/sets/%s/play?player=sm&mix_id=%s&format=jsonh' % (session, mix_id) next_url = first_url entries = [] for i in range(track_count): - api_json = None download_tries = 0 @@ -136,14 +136,14 @@ class EightTracksIE(InfoExtractor): raise else: download_tries += 1 - time.sleep(avg_song_duration) + self._sleep(avg_song_duration, playlist_id) api_data = json.loads(api_json) track_data = api_data['set']['track'] info = { 'id': compat_str(track_data['id']), 'url': track_data['track_file_stream_url'], - 'title': track_data['performer'] + u' - ' + track_data['name'], + 'title': track_data['performer'] + ' - ' + track_data['name'], 'raw_title': track_data['name'], 'uploader_id': data['user']['login'], 'ext': 'm4a',