From a59e7fe65f3c19fd7b6833fa49869ef93d0bc9f6 Mon Sep 17 00:00:00 2001 From: meeb Date: Sat, 4 Sep 2021 15:22:45 +1000 Subject: [PATCH] remove broken playlist_index support in media formatting options, resolves #142 --- tubesync/sync/models.py | 12 ------------ tubesync/sync/templates/sync/_mediaformatvars.html | 5 ----- tubesync/sync/testdata/metadata.json | 1 - tubesync/sync/tests.py | 3 --- 4 files changed, 21 deletions(-) diff --git a/tubesync/sync/models.py b/tubesync/sync/models.py index 2a2626c1..269302fd 100644 --- a/tubesync/sync/models.py +++ b/tubesync/sync/models.py @@ -440,7 +440,6 @@ class Source(models.Model): 'title_full': 'Some Media Title Name', 'key': 'SoMeUnIqUiD', 'format': '-'.join(fmt), - 'playlist_index': 1, 'playlist_title': 'Some Playlist Title', 'ext': self.extension, 'resolution': self.source_resolution if self.source_resolution else '', @@ -562,11 +561,6 @@ class Media(models.Model): Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'dislike_count', Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'dislike_count', }, - 'playlist_index': { - Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'playlist_index', - Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'playlist_index', - Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'playlist_index', - }, 'playlist_title': { Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'playlist_title', Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'playlist_title', @@ -929,7 +923,6 @@ class Media(models.Model): 'title_full': clean_filename(self.title), 'key': self.key, 'format': '-'.join(display_format['format']), - 'playlist_index': self.playlist_index, 'playlist_title': self.playlist_title, 'ext': self.source.extension, 'resolution': display_format['resolution'], @@ -1046,11 +1039,6 @@ class Media(models.Model): field = self.get_metadata_field('formats') return self.loaded_metadata.get(field, []) - @property - def playlist_index(self): - field = self.get_metadata_field('playlist_index') - return self.loaded_metadata.get(field, 0) - @property def playlist_title(self): field = self.get_metadata_field('playlist_title') diff --git a/tubesync/sync/templates/sync/_mediaformatvars.html b/tubesync/sync/templates/sync/_mediaformatvars.html index ea1581d9..4a0b3e95 100644 --- a/tubesync/sync/templates/sync/_mediaformatvars.html +++ b/tubesync/sync/templates/sync/_mediaformatvars.html @@ -63,11 +63,6 @@ Media format string 720p-avc1-mp4a - - {playlist_index} - Playlist index of media, if it's in a playlist - 12 - {playlist_title} Playlist title of media, if it's in a playlist diff --git a/tubesync/sync/testdata/metadata.json b/tubesync/sync/testdata/metadata.json index 1ee9b8cf..109ddd93 100644 --- a/tubesync/sync/testdata/metadata.json +++ b/tubesync/sync/testdata/metadata.json @@ -9,7 +9,6 @@ "average_rating": 1.2345, "dislike_count": 123, "like_count": 456, - "playlist_index": 789, "playlist_title": "test playlist", "uploader": "test uploader", "categories":[ diff --git a/tubesync/sync/tests.py b/tubesync/sync/tests.py index 460558c8..2f40f87f 100644 --- a/tubesync/sync/tests.py +++ b/tubesync/sync/tests.py @@ -539,9 +539,6 @@ class FilepathTestCase(TestCase): self.source.media_format = 'test-{format}' self.assertEqual(self.source.get_example_media_format(), 'test-1080p-vp9-opus') - self.source.media_format = 'test-{playlist_index}' - self.assertEqual(self.source.get_example_media_format(), - 'test-1') self.source.media_format = 'test-{playlist_title}' self.assertEqual(self.source.get_example_media_format(), 'test-Some Playlist Title')