PublicSnapshot
/
tubesync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle dash videos with no progress downloaded byte totals

This commit is contained in:
meeb 2020-12-13 21:21:35 +11:00
parent d7a3ee277e
commit ce50eaaac8
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tubesync/sync/models.py
View File

@ -637,13 +637,6 @@ class Media(models.Model):
# If the download has completed use existing values
if self.downloaded:
if self.downloaded_format != 'audio':
video_format = self.downloaded_format.lower()
if ' ' in video_format or not video_format.lower().endswith('p'):
height = self.downloaded_height
if height > 0:
fmt.append(f'{height}p')
else:
fmt.append(video_format)
fmt.append(self.downloaded_video_codec.lower())
fmt.append(self.downloaded_audio_codec.lower())
if self.downloaded_format != 'audio':

21
tubesync/sync/youtube.py
View File

@ -53,15 +53,18 @@ def download_media(url, media_format, extension, output_file):
if event['status'] == 'error':
log.error(f'[youtube-dl] error occured downloading: {filename}')
elif event['status'] == 'downloading':
p = round((event['downloaded_bytes'] / event['total_bytes']) * 100)
if (p % 5 == 0) and p > hook.download_progress:
hook.download_progress = p
eta = event.get('_eta_str', '?').strip()
percent_done = event.get('_percent_str', '?').strip()
speed = event.get('_speed_str', '?').strip()
total = event.get('_total_bytes_str', '?').strip()
log.info(f'[youtube-dl] downloading: {filename} - {percent_done} of '
f'{total} at {speed}, {eta} remaining')
downloaded_bytes = event.get('downloaded_bytes', 0)
total_bytes = event.get('total_bytes', 0)
eta = event.get('_eta_str', '?').strip()
percent_done = event.get('_percent_str', '?').strip()
speed = event.get('_speed_str', '?').strip()
total = event.get('_total_bytes_str', '?').strip()
if downloaded_bytes > 0 and total_bytes > 0:
p = round((event['downloaded_bytes'] / event['total_bytes']) * 100)
if (p % 5 == 0) and p > hook.download_progress:
hook.download_progress = p
log.info(f'[youtube-dl] downloading: {filename} - {percent_done} '
f'of {total} at {speed}, {eta} remaining')
elif event['status'] == 'finished':
total_size_str = event.get('_total_bytes_str', '?').strip()
elapsed_str = event.get('_elapsed_str', '?').strip()