From 81edd08c7d8ce8d0844b82751b730d2dc91ff4ac Mon Sep 17 00:00:00 2001 From: Makhuta Date: Sat, 11 Jan 2025 14:38:31 +0100 Subject: [PATCH] Update - added video order to Media Format --- tubesync/sync/models.py | 9 +++++++-- tubesync/sync/templates/sync/_mediaformatvars.html | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tubesync/sync/models.py b/tubesync/sync/models.py index 2037492d..8e37bdbe 100644 --- a/tubesync/sync/models.py +++ b/tubesync/sync/models.py @@ -589,6 +589,7 @@ class Source(models.Model): 'key': 'SoMeUnIqUiD', 'format': '-'.join(fmt), 'playlist_title': 'Some Playlist Title', + 'video_order': '1', 'ext': self.extension, 'resolution': self.source_resolution if self.source_resolution else '', 'height': '720' if self.source_resolution else '', @@ -1128,6 +1129,7 @@ class Media(models.Model): 'key': self.key, 'format': '-'.join(display_format['format']), 'playlist_title': self.playlist_title, + 'video_order': self.get_episode_str(), 'ext': self.source.extension, 'resolution': display_format['resolution'], 'height': display_format['height'], @@ -1373,8 +1375,7 @@ class Media(models.Model): nfo.append(season) # episode = number of video in the year episode = nfo.makeelement('episode', {}) - episode_number = self.calculate_episode_number() - episode.text = str(episode_number) if episode_number else '' + episode.text = self.get_episode_str() episode.tail = '\n ' nfo.append(episode) # ratings = media metadata youtube rating @@ -1524,6 +1525,10 @@ class Media(models.Model): return position_counter position_counter += 1 + def get_episode_str(self): + episode_number = self.calculate_episode_number() + return f'{episode_number:02}' if episode_number else '' + class MediaServer(models.Model): ''' diff --git a/tubesync/sync/templates/sync/_mediaformatvars.html b/tubesync/sync/templates/sync/_mediaformatvars.html index 438b200a..06068f90 100644 --- a/tubesync/sync/templates/sync/_mediaformatvars.html +++ b/tubesync/sync/templates/sync/_mediaformatvars.html @@ -73,6 +73,11 @@ Playlist title of media, if it's in a playlist Some Playlist + + {video_order} + Episode order in playlist, if in playlist (can cause issues if playlist is changed after adding) + 01 + {ext} File extension