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

handle weird formats like dash with no preset height

This commit is contained in:
meeb 2020-12-13 21:07:54 +11:00
parent 3aabbfaaac
commit a8564c2554
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tubesync/sync/models.py
View File

@ -637,7 +637,13 @@ class Media(models.Model):
# If the download has completed use existing values # If the download has completed use existing values
if self.downloaded: if self.downloaded:
if self.downloaded_format != 'audio': if self.downloaded_format != 'audio':
fmt.append(self.downloaded_format.lower()) 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_video_codec.lower())
fmt.append(self.downloaded_audio_codec.lower()) fmt.append(self.downloaded_audio_codec.lower())
if self.downloaded_format != 'audio': if self.downloaded_format != 'audio':
@ -661,6 +667,13 @@ class Media(models.Model):
# Combined # Combined
vformat = cformat vformat = cformat
if vformat: if vformat:
video_format = vformat['format'].lower()
if ' ' in video_format or not video_format.lower().endswith('p'):
height = vformat.get('height', 0)
if height > 0:
fmt.append(f'{height}p')
else:
fmt.append(video_format)
fmt.append(vformat['format'].lower()) fmt.append(vformat['format'].lower())
fmt.append(vformat['vcodec'].lower()) fmt.append(vformat['vcodec'].lower())
fmt.append(aformat['acodec'].lower()) fmt.append(aformat['acodec'].lower())