From acd2d652eff5c8ce7eeb2e935f9fc5612bc3d79e Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Sat, 1 Oct 2022 22:02:48 -0700 Subject: [PATCH] underscore hidden presets --- .../prebuilt_presets/helpers/kodi-safe.yaml | 2 +- .../prebuilt_presets/tv_show/__init__.py | 16 +++++----- .../prebuilt_presets/tv_show/episode.yaml | 32 +++++++++---------- .../prebuilt_presets/tv_show/players.yaml | 14 ++++---- .../tv_show/tv_show_type.yaml | 4 +-- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml b/src/ytdl_sub/prebuilt_presets/helpers/kodi-safe.yaml index 85cd11bd..24c2005d 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 dc53dfc1..598e8fa7 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py +++ b/src/ytdl_sub/prebuilt_presets/tv_show/__init__.py @@ -11,14 +11,14 @@ Preset = Dict[str, Any] #################################################### # TV SHOW TYPES -KODI_TV_SHOW = "kodi_tv_show" -JELLYFIN_TV_SHOW = "jellyfin_tv_show" -PLEX_TV_SHOW = "plex_tv_show" +KODI_TV_SHOW = "_kodi_tv_show" +JELLYFIN_TV_SHOW = "_jellyfin_tv_show" +PLEX_TV_SHOW = "_plex_tv_show" ##################################################### # TV SHOW URL PRESETS -TV_SHOW_URL = "tv_show_url" +TV_SHOW_BY_DATE = "_tv_show_by_date" SEASON_YEAR__EPISODE_MONTH_DAY = "season_by_year__episode_by_month_day" SEASON_YEAR__EPISODE_MONTH_DAY_REVERSED = "season_by_year__episode_by_month_day_reversed" @@ -27,7 +27,7 @@ SEASON_YEAR_MONTH__EPISODE_DAY = "season_by_year_month__episode_by_day" ##################################################### # TV SHOW COLLECTION PRESETS -TV_SHOW_COLLECTION = "tv_show_collection" +TV_SHOW_COLLECTION = "_tv_show_collection" SEASON_COLLECTION__EPISODE_Y_M_D = "season_by_collection__episode_by_year_month_day" SEASON_COLLECTION__EPISODE_Y_M_D_REV = "season_by_collection__episode_by_year_month_day_reversed" @@ -74,7 +74,7 @@ class TvShowByDatePresets(PrebuiltPresets): Formats a TV show organized by date for Kodi """ return self._build_preset( - name="kodi_tv_show_by_date", parent_presets=[KODI_TV_SHOW, TV_SHOW_URL] + name="kodi_tv_show_by_date", parent_presets=[KODI_TV_SHOW, TV_SHOW_BY_DATE] ) @property @@ -83,7 +83,7 @@ class TvShowByDatePresets(PrebuiltPresets): Formats a TV show organized by date for Jellyfin """ return self._build_preset( - name="jellyfin_tv_show_by_date", parent_presets=[JELLYFIN_TV_SHOW, TV_SHOW_URL] + name="jellyfin_tv_show_by_date", parent_presets=[JELLYFIN_TV_SHOW, TV_SHOW_BY_DATE] ) @property @@ -92,7 +92,7 @@ class TvShowByDatePresets(PrebuiltPresets): Formats a TV show organized by date for Plex """ return self._build_preset( - name="plex_tv_show_by_date", parent_presets=[PLEX_TV_SHOW, TV_SHOW_URL] + name="plex_tv_show_by_date", parent_presets=[PLEX_TV_SHOW, TV_SHOW_BY_DATE] ) diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml index 38fdb433..3eb71d29 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}" @@ -29,7 +29,7 @@ presets: episode_file_path: "Season {season_number_padded}/{episode_file_name}" episode_number_suffix: "" - episode_video_tags: + _episode_video_tags: video_tags: tags: show: "{tv_show_name}" @@ -40,7 +40,7 @@ presets: year: "{episode_year}" date: "{episode_date_standardized}" - episode_nfo_tags: + _episode_nfo_tags: nfo_tags: nfo_name: "{episode_file_path}.nfo" nfo_root: "episodedetails" @@ -60,12 +60,12 @@ 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}" @@ -74,24 +74,24 @@ presets: 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}{upload_date_index_padded}" 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_padded: "{upload_month_padded}{upload_day_padded}{upload_date_index_padded}" 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}{upload_date_index_reversed_padded}" episode_number_padded: "{upload_day_of_year_reversed_padded}{upload_date_index_reversed_padded}" @@ -100,30 +100,28 @@ presets: 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}{upload_date_index_padded}" episode_number_padded: "{episode_number}" 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}{upload_date_index_reversed_padded}" episode_number_padded: "{episode_number}" season_by_collection__episode_by_playlist_index: preset: - - "episode_base" + - "_episode_base" overrides: episode_number: "{playlist_index}" episode_number_padded: "{playlist_index_padded6}" season_by_collection__episode_by_playlist_index_reversed: preset: - - "episode_base" + - "_episode_base" overrides: episode_number: "{playlist_index_reversed}" episode_number_padded: "{playlist_index_reversed_padded6}" - -#################################################################################################### diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml index 2cf73c50..4228ab73 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml +++ b/src/ytdl_sub/prebuilt_presets/tv_show/players.yaml @@ -1,22 +1,22 @@ presets: - plex_tv_show: + _plex_tv_show: preset: - - "episode_video_tags" + - "_episode_video_tags" overrides: tv_show_poster_file_name: "poster.jpg" tv_show_fanart_file_name: "fanart.jpg" season_poster_file_name: "Season{season_number_padded}.jpg" - jellyfin_tv_show: + _jellyfin_tv_show: preset: - - "episode_nfo_tags" + - "_episode_nfo_tags" overrides: tv_show_poster_file_name: "poster.jpg" tv_show_fanart_file_name: "fanart.jpg" season_poster_file_name: "season{season_number_padded}-poster.jpg" - 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 3b1bfbd4..c93e52be 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_by_date: generic: download_strategy: "source" url: "{url}" @@ -20,7 +20,7 @@ presets: # 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"