hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-22 04:56:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #761 from tcely/patch-14

Browse Source 
Be more consistent with `fmt`
This commit is contained in:
meeb 2025-02-24 17:40:08 +11:00 committed by GitHub
commit 4fbbff5849
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tubesync/sync/models.py
View File

@ -883,13 +883,18 @@ class Media(models.Model):
resolution = self.downloaded_format.lower() resolution = self.downloaded_format.lower()
elif self.downloaded_height: elif self.downloaded_height:
resolution = f'{self.downloaded_height}p' resolution = f'{self.downloaded_height}p'
if resolution:
fmt.append(resolution)
if self.downloaded_format != Val(SourceResolution.AUDIO): if self.downloaded_format != Val(SourceResolution.AUDIO):
vcodec = self.downloaded_video_codec.lower() vcodec = self.downloaded_video_codec.lower()
if vcodec:
fmt.append(vcodec) fmt.append(vcodec)
acodec = self.downloaded_audio_codec.lower() acodec = self.downloaded_audio_codec.lower()
if acodec:
fmt.append(acodec) fmt.append(acodec)
if self.downloaded_format != Val(SourceResolution.AUDIO): if self.downloaded_format != Val(SourceResolution.AUDIO):
fps = str(self.downloaded_fps) fps = str(self.downloaded_fps)
if fps:
fmt.append(f'{fps}fps') fmt.append(f'{fps}fps')
if self.downloaded_hdr: if self.downloaded_hdr:
hdr = 'hdr' hdr = 'hdr'
@ -922,12 +927,18 @@ class Media(models.Model):
# Combined # Combined
vformat = cformat vformat = cformat
if vformat: if vformat:
if vformat['format']:
resolution = vformat['format'].lower() resolution = vformat['format'].lower()
else:
resolution = f"{vformat['height']}p"
if resolution:
fmt.append(resolution) fmt.append(resolution)
vcodec = vformat['vcodec'].lower() vcodec = vformat['vcodec'].lower()
if vcodec:
fmt.append(vcodec) fmt.append(vcodec)
if aformat: if aformat:
acodec = aformat['acodec'].lower() acodec = aformat['acodec'].lower()
if acodec:
fmt.append(acodec) fmt.append(acodec)
if vformat: if vformat:
if vformat['is_60fps']: if vformat['is_60fps']: