R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved progress reporting

Browse Source
This commit is contained in:
deezerdl 2017-05-30 14:28:16 +00:00 committed by GitHub
parent d431c70c6a
commit 2fd78e9baf
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
youtube_dl/downloader/deezer.py
View File

@ -16,7 +16,7 @@ def writeid3v1(fo, info_dict):
b"", # year b"", # year
b"", # comment b"", # comment
0, int(info_dict["track_number"] or 0), # tracknum 0, int(info_dict["track_number"] or 0), # tracknum
255) # genre 255) # genre
fo.write(data) fo.write(data)
@ -62,7 +62,7 @@ def writeid3v2(fo, info_dict, ydl):
fo.write(id3data) fo.write(id3data)
def decryptfile(fh, key, fo, progress, data_len): def decryptfile(fh, key, fo, progressupdate):
""" """
Decrypt data from file <fh>, and write to file <fo>. Decrypt data from file <fh>, and write to file <fo>.
decrypt using blowfish with <key>. decrypt using blowfish with <key>.
@ -70,7 +70,6 @@ def decryptfile(fh, key, fo, progress, data_len):
""" """
i = 0 i = 0
byte_counter = 0 byte_counter = 0
tstart = time.time()
while True: while True:
data = fh.read(2048) data = fh.read(2048)
if not data: if not data:
@ -83,13 +82,8 @@ def decryptfile(fh, key, fo, progress, data_len):
byte_counter += len(data) byte_counter += len(data)
progress._hook_progress({ if (i % 16) == 0:
'status': 'downloading', progressupdate(byte_counter)
'downloaded_bytes': byte_counter,
'total_bytes': data_len,
'eta': progress.calc_eta(tstart, time.time(), data_len, byte_counter),
'speed': progress.calc_speed(tstart, time.time(), byte_counter),
})
class DeezerDownloader(FileDownloader): class DeezerDownloader(FileDownloader):
@ -98,11 +92,33 @@ class DeezerDownloader(FileDownloader):
request = sanitized_Request(url, None, {}) request = sanitized_Request(url, None, {})
data = self.ydl.urlopen(request) data = self.ydl.urlopen(request)
tstart = time.time()
data_len = int(data.info().get('Content-length', 0))
def progressupdate(byte_counter):
self._hook_progress({
'filename': filename,
'status': 'downloading',
'downloaded_bytes': byte_counter,
'total_bytes': data_len,
'eta': self.calc_eta(tstart, time.time(), data_len, byte_counter),
'speed': self.calc_speed(tstart, time.time(), byte_counter),
})
def progressfinished():
self._hook_progress({
'filename': filename,
'status': 'finished',
'downloaded_bytes': data_len,
'total_bytes': data_len,
})
stream, realfilename = sanitize_open(filename, "wb") stream, realfilename = sanitize_open(filename, "wb")
try: try:
writeid3v2(stream, info_dict, self.ydl) writeid3v2(stream, info_dict, self.ydl)
decryptfile(data, info_dict['key'], stream, self, int(data.info().get('Content-length', 0))) decryptfile(data, info_dict['key'], stream, progressupdate)
writeid3v1(stream, info_dict) writeid3v1(stream, info_dict)
progressfinished()
finally: finally:
if realfilename != '-': if realfilename != '-':
stream.close() stream.close()