From efed7057f9e907090b49e69b999b029e658cebe0 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 30 Sep 2022 10:26:34 -0700 Subject: [PATCH] underscores --- .../prebuilt_presets/helpers/kodi-safe.yaml | 2 +- .../prebuilt_presets/tv_show/__init__.py | 10 +++--- .../prebuilt_presets/tv_show/episode.yaml | 36 +++++++++---------- .../prebuilt_presets/tv_show/players.yaml | 10 +++--- .../tv_show/tv_show_type.yaml | 20 +++++------ .../prebuilt_presets/test_prebuilt_presets.py | 26 +++++++------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml b/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml index bec36307..85cd11bd 100644 --- a/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml +++ b/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml @@ -1,6 +1,6 @@ presets: - kodi-safe-nfo: + kodi_safe_nfo: nfo_tags: kodi_safe: True output_directory_nfo_tags: diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py b/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py index 2ced4e82..41479154 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py +++ b/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py @@ -17,18 +17,18 @@ class PrebuiltPresets: Kodi TV Show with seasons as years, episodes ordered by upload date """ return self._preset( - name=name, presets=["tv-show-url", "season-by-year--episode-by-month-day"] + name=name, presets=["tv_show_url", "season_by_year__episode_by_month_day"] ) def _tv_show_youtube_channel(self, name: str) -> Preset: return self._preset( - name=name, presets=["tv-show-youtube-channel", "season-by-year--episode-by-month-day"] + name=name, presets=["tv_show_youtube_channel", "season_by_year__episode_by_month_day"] ) def _tv_show_collection(self, name: str) -> Preset: return self._preset( name=name, - presets=["tv-show-collection", "season-by-collection--episode-by-year-month-day"], + presets=["tv_show_collection", "season_by_collection__episode_by_year_month_day"], ) @classmethod @@ -53,7 +53,7 @@ class PrebuiltPresets: class PrebuiltKodiTVShowPresets(PrebuiltPresets): - BASE_PRESET = "kodi-tv-show" + BASE_PRESET = "kodi_tv_show" @property def kodi_tv_show_url(self) -> Preset: @@ -78,7 +78,7 @@ class PrebuiltKodiTVShowPresets(PrebuiltPresets): class PrebuiltJellyfinTVShowPresets(PrebuiltPresets): - BASE_PRESET = "jellyfin-tv-show" + BASE_PRESET = "jellyfin_tv_show" @property def jellyfin_tv_show_url(self) -> Preset: diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml index bacc8072..ec1a5797 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml +++ b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml @@ -2,7 +2,7 @@ presets: #################################################################################################### - episode-base: + episode_base: output_options: output_directory: "{tv_show_directory}/{tv_show_name_sanitized}" file_name: "{episode_file_path}.{ext}" @@ -31,62 +31,62 @@ presets: #################################################################################################### - season-by-year: + season_by_year: overrides: season_number: "{upload_year}" season_number_padded: "{season_number}" - season-by-year-month: + season_by_year_month: overrides: season_number: "{upload_year}{upload_month_padded}" season_number_padded: "{season_number}" #################################################################################################### - season-by-year-month--episode-by-day: + season_by_year_month__episode_by_day: preset: - - "episode-base" - - "season-by-year-month" + - "episode_base" + - "season_by_year_month" overrides: episode_number: "{upload_day}" episode_number_padded: "{upload_day_padded}" - season-by-year--episode-by-month-day: + season_by_year__episode_by_month_day: preset: - - "episode-base" - - "season-by-year" + - "episode_base" + - "season_by_year" overrides: episode_number: "{upload_month}{upload_day_padded}{episode_number_suffix}" episode_number_padded: "{upload_month_padded}{upload_day_padded}{episode_number_suffix}" - season-by-year--episode-by-month-day-reversed: + season_by_year__episode_by_month_day_reversed: preset: - - "episode-base" - - "season-by-year" + - "episode_base" + - "season_by_year" overrides: episode_number: "{upload_day_of_year_reversed}{episode_number_suffix}" episode_number_padded: "{upload_day_of_year_reversed_padded}{episode_number_suffix}" - season-by-collection--episode-by-year-month-day: + season_by_collection__episode_by_year_month_day: preset: - - "episode-base" + - "episode_base" overrides: episode_number: "{upload_year_truncated}{upload_month_padded}{upload_day_padded}{episode_number_suffix}" episode_number_padded: "{episode_number}" - season-by-collection--episode-by-year-month-day-reversed: + season_by_collection__episode_by_year_month_day_reversed: preset: - - "episode-base" + - "episode_base" overrides: episode_number: "{upload_year_truncated_reversed}{upload_month_reversed_padded}{upload_day_reversed_padded}{episode_number_suffix}" episode_number_padded: "{episode_number}" #################################################################################################### - episode-add-hour-granularity: + episode_add_hour_granularity: overrides: episode_number_suffix: "{epoch_hour}{playlist_index_reversed_padded6}" - episode-add-hour-granularity-reversed: + episode_add_hour_granularity_reversed: overrides: episode_number_suffix: "{epoch_hour}{playlist_index_padded6}" diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml index b2915776..90a3dc8f 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml +++ b/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml @@ -1,12 +1,12 @@ presets: - plex-tv-show: + plex_tv_show: overrides: tv_show_poster_file_name: "show.jpg" tv_show_fanart_file_name: "fanart.jpg" season_poster_file_name: "Season{season_number_padded}.jpg" - jellyfin-tv-show: + jellyfin_tv_show: overrides: tv_show_poster_file_name: "poster.jpg" tv_show_fanart_file_name: "fanart.jpg" @@ -29,7 +29,7 @@ presets: tags: title: "{tv_show_name}" - kodi-tv-show: + kodi_tv_show: preset: - - "jellyfin-tv-show" - - "kodi-safe-nfo" + - "jellyfin_tv_show" + - "kodi_safe_nfo" diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_type.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_type.yaml index fd1d8185..1f11a10c 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_type.yaml +++ b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_type.yaml @@ -3,7 +3,7 @@ presets: #################################################################################################### # TV show from any single source. Uses latest entry's thumbnail as tv show poster - tv-show-url: + tv_show_url: generic: download_strategy: "source" url: "{url}" @@ -14,7 +14,7 @@ presets: #################################################################################################### # TV show from a single YouTube channel. Uses avatar and banner as poster and fanart. - tv-show-youtube-channel: + tv_show_youtube_channel: generic: download_strategy: "source" url: "{url}" @@ -26,9 +26,9 @@ presets: #################################################################################################### - # TV show from a collection. Must specify additional `tv-show-collection-season` presets in + # TV show from a collection. Must specify additional `tv_show_collection_season` presets in # addition. Each season sets its own `collection_season_number/_padded` - tv-show-collection: + tv_show_collection: generic: download_strategy: "collection" @@ -36,7 +36,7 @@ presets: season_number: "{collection_season_number}" season_number_padded: "{collection_season_number_padded}" - tv-show-collection-season-1-youtube-channel: + tv_show_collection_season_1_youtube_channel: generic: urls: - url: "{collection_season_1_url}" @@ -58,7 +58,7 @@ presets: attributes: number: "1" - tv-show-collection-season-1: + tv_show_collection_season_1: generic: urls: - url: "{collection_season_1_url}" @@ -76,7 +76,7 @@ presets: attributes: number: "1" - tv-show-collection-season-2: + tv_show_collection_season_2: generic: urls: - url: "{collection_season_2_url}" @@ -94,7 +94,7 @@ presets: attributes: number: "2" - tv-show-collection-season-3: + tv_show_collection_season_3: generic: urls: - url: "{collection_season_3_url}" @@ -112,7 +112,7 @@ presets: attributes: number: "3" - tv-show-collection-season-4: + tv_show_collection_season_4: generic: urls: - url: "{collection_season_4_url}" @@ -130,7 +130,7 @@ presets: attributes: number: "4" - tv-show-collection-season-5: + tv_show_collection_season_5: generic: urls: - url: "{collection_season_5_url}" diff --git a/tests/unit/prebuilt_presets/test_prebuilt_presets.py b/tests/unit/prebuilt_presets/test_prebuilt_presets.py index 2ba03ccd..01ebffa0 100644 --- a/tests/unit/prebuilt_presets/test_prebuilt_presets.py +++ b/tests/unit/prebuilt_presets/test_prebuilt_presets.py @@ -27,17 +27,17 @@ class TestPrebuiltTVShowPresets: @pytest.mark.parametrize( "tv_show_structure_preset", [ - "season-by-year-month--episode-by-day", - "season-by-year--episode-by-month-day", - "season-by-year--episode-by-month-day-reversed", + "season_by_year_month__episode_by_day", + "season_by_year__episode_by_month_day", + "season_by_year__episode_by_month_day_reversed", ], ) @pytest.mark.parametrize( "episode_hour_granularity_preset", [ None, - "episode-add-hour-granularity", - "episode-add-hour-granularity-reversed", + "episode_add_hour_granularity", + "episode_add_hour_granularity_reversed", ], ) def test_non_collection_presets_compile( @@ -53,7 +53,7 @@ class TestPrebuiltTVShowPresets: preset = Preset.from_dict( config=config, - preset_name=f"{media_player_preset}-test", + preset_name=f"{media_player_preset}_test", preset_dict={ "preset": parent_presets, "overrides": { @@ -75,16 +75,16 @@ class TestPrebuiltTVShowPresets: @pytest.mark.parametrize( "tv_show_structure_preset", [ - "season-by-collection--episode-by-year-month-day", - "season-by-collection--episode-by-year-month-day-reversed", + "season_by_collection__episode_by_year_month_day", + "season_by_collection__episode_by_year_month_day_reversed", ], ) @pytest.mark.parametrize( "episode_hour_granularity_preset", [ None, - "episode-add-hour-granularity", - "episode-add-hour-granularity-reversed", + "episode_add_hour_granularity", + "episode_add_hour_granularity_reversed", ], ) @pytest.mark.parametrize("season_indices", [[1], [1, 2, 3, 4, 5]]) @@ -104,9 +104,9 @@ class TestPrebuiltTVShowPresets: overrides: Dict[str, str] = {} for season_index in season_indices: - parent_presets.append(f"tv-show-collection-season-{season_index}") + parent_presets.append(f"tv_show_collection_season_{season_index}") if season_index == 1 and is_season_1_youtube_channel: - parent_presets[-1] += "-youtube-channel" + parent_presets[-1] += "_youtube_channel" overrides = dict( overrides, @@ -118,7 +118,7 @@ class TestPrebuiltTVShowPresets: preset = Preset.from_dict( config=config, - preset_name=f"{media_player_preset}-test", + preset_name=f"{media_player_preset}_test", preset_dict={ "preset": parent_presets, "overrides": dict(