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

handle rare formats with non-int pixels sizes

This commit is contained in:
meeb 2020-12-13 21:48:26 +11:00
parent f2f2671cf1
commit a48d8df6f7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tubesync/sync/utils.py
View File

@ -150,6 +150,15 @@ def parse_media_format(format_dict):
except (ValueError, TypeError): except (ValueError, TypeError):
fps = 0 fps = 0
height = format_dict.get('height', 0) height = format_dict.get('height', 0)
try:
height = int(height)
except (ValueError, TypeError):
height = 0
width = format_dict.get('width', 0)
try:
width = int(width)
except (ValueError, TypeError):
width = 0
format_full = format_dict.get('format_note', '').strip().upper() format_full = format_dict.get('format_note', '').strip().upper()
format_str = format_full[:-2] if format_full.endswith('60') else format_full format_str = format_full[:-2] if format_full.endswith('60') else format_full
format_str = format_str.strip() format_str = format_str.strip()
@ -162,7 +171,7 @@ def parse_media_format(format_dict):
if 'DASH' in format_str: if 'DASH' in format_str:
is_hls = False is_hls = False
is_dash = True is_dash = True
if height and height > 0: if height > 0:
height = f'{height}P' height = f'{height}P'
else: else:
format_str = None format_str = None
@ -171,7 +180,7 @@ def parse_media_format(format_dict):
'format': format_str, 'format': format_str,
'format_verbose': format_dict.get('format', ''), 'format_verbose': format_dict.get('format', ''),
'height': height, 'height': height,
'width': format_dict.get('width', 0), 'width': width,
'vcodec': vcodec, 'vcodec': vcodec,
'fps': format_dict.get('fps', 0), 'fps': format_dict.get('fps', 0),
'vbr': format_dict.get('tbr', 0), 'vbr': format_dict.get('tbr', 0),