Taking comments into consideration

src/ytdl_sub/prebuilt_presets/helpers/download_deletion_options.yaml

@@ -1,26 +1,23 @@
 presets:
 
   "Only Recent":
+    preset:
+      - "Only Recent Archive"
     # Only fetch videos after today minus date_range
-    date_range:
-      after: "today-{only_recent_date_range}"
 
     # Only keep files uploaded after date_range
     output_options:
       keep_files_after: "today-{only_recent_date_range}"
       keep_max_files: "{only_recent_max_files}"
 
-    # Set the default date_range to 2 months
     overrides:
-      date_range: "2months"  # keep for legacy-reasons
-      only_recent_date_range: "{date_range}"
       only_recent_max_files: 0
 
 
   "Only Recent Archive":
     # Only fetch videos after today minus date_range
     date_range:
-      after: "today-{fetch_newest_date_range}"
+      after: "today-{only_recent_date_range}"
 
     # Set the default date_range to 2 months
     overrides:

src/ytdl_sub/prebuilt_presets/music/other_websites.yaml

@@ -0,0 +1,38 @@
+presets:
+
+  "SoundCloud Discography":
+    preset: "_music_base"
+
+    # Download using the multi_url strategy
+    download:
+      download_strategy: "multi_url"
+      urls:
+        # The first URL will be all the artist's tracks.
+        # Treat these as singles - an album with a single track
+        - url: "{url}/tracks"
+          include_sibling_metadata: False
+          variables:
+            sc_track_album: "{title}"
+            sc_track_number: "1"
+            sc_track_number_padded: "01"
+            sc_track_total: "1"
+            sc_track_year: "{upload_year}"
+        # Set the second URL to the artist's albums. If a track belongs to both
+        # to an album and tracks (in the URL above), it will resolve to this
+        # URL and include the album metadata we set below.
+        - url: "{url}/albums"
+          include_sibling_metadata: True
+          variables:
+            sc_track_album: "{playlist_title}"
+            sc_track_number: "{playlist_index}"
+            sc_track_number_padded: "{playlist_index_padded}"
+            sc_track_total: "{playlist_count}"
+            sc_track_year: "{playlist_max_upload_year}"
+
+    # Override various track properties using playlist variables.
+    overrides:
+      track_album: "{sc_track_album}"
+      track_number: "{sc_track_number}"
+      track_number_padded: "{sc_track_number_padded}"
+      track_total: "{sc_track_total}"
+      track_year: "{sc_track_year}"

src/ytdl_sub/prebuilt_presets/music/singles.yaml

@@ -69,44 +69,4 @@ presets:
 
     download:
       - url: "{url}"
-        include_sibling_metadata: False
+        include_sibling_metadata: False
-
-
-
-  "SoundCloud Discography":
-    preset: "_music_base"
-
-    # Download using the multi_url strategy
-    download:
-      download_strategy: "multi_url"
-      urls:
-        # The first URL will be all the artist's tracks.
-        # Treat these as singles - an album with a single track
-        - url: "{url}/tracks"
-          include_sibling_metadata: False
-          variables:
-            sc_track_album: "{title}"
-            sc_track_number: "1"
-            sc_track_number_padded: "01"
-            sc_track_total: "1"
-            sc_track_year: "{upload_year}"
-        # Set the second URL to the artist's albums. If a track belongs to both
-        # to an album and tracks (in the URL above), it will resolve to this
-        # URL and include the album metadata we set below.
-        - url: "{url}/albums"
-          include_sibling_metadata: True
-          variables:
-            sc_track_album: "{playlist_title}"
-            sc_track_number: "{playlist_index}"
-            sc_track_number_padded: "{playlist_index_padded}"
-            sc_track_total: "{playlist_count}"
-            sc_track_year: "{playlist_max_upload_year}"
-
-    # Override various track properties using playlist variables.
-    overrides:
-      track_album: "{sc_track_album}"
-      track_number: "{sc_track_number}"
-      track_number_padded: "{sc_track_number_padded}"
-      track_total: "{sc_track_total}"
-      track_year: "{sc_track_year}"
-

src/ytdl_sub/prebuilt_presets/music_videos/music_video_base.yaml

@@ -32,26 +32,4 @@ presets:
       music_video_genre: "{subscription_indent_1}"
 
       # Directory Overrides
-      music_video_file_name: "{music_video_artist_sanitized}/{music_video_title_sanitized}"
+      music_video_file_name: "{music_video_artist_sanitized}/{music_video_title_sanitized}"
-
-  _music_video_nfo:
-    nfo_tags:
-      nfo_name: "{music_video_file_name}.nfo"
-      nfo_root: "musicvideo"
-      tags:
-        artist: "{music_video_artist}"
-        title: "{music_video_title}"
-        album: "{music_video_album}"
-        genre:
-          - "{music_video_genre}"
-        # Kodi v20 to not use year, so removing
-        premiered: "{music_video_date}"
-
-  _music_video_tags:
-    video_tags:
-      artist: "{music_video_artist}"
-      title: "{music_video_title}"
-      album: "{music_video_album}"
-      genre: "{music_video_genre}"
-      year: "{music_video_year}"
-      premiered: "{music_video_date}"

src/ytdl_sub/prebuilt_presets/music_videos/music_videos.yaml

@@ -18,4 +18,26 @@ presets:
     preset:
       - "_plex_video_base"
       - "_music_video_base"
-      - "_music_video_tags"
+      - "_music_video_tags"
+
+  _music_video_nfo:
+    nfo_tags:
+      nfo_name: "{music_video_file_name}.nfo"
+      nfo_root: "musicvideo"
+      tags:
+        artist: "{music_video_artist}"
+        title: "{music_video_title}"
+        album: "{music_video_album}"
+        genre:
+          - "{music_video_genre}"
+        # Kodi v20 to not use year, so removing
+        premiered: "{music_video_date}"
+
+  _music_video_tags:
+    video_tags:
+      artist: "{music_video_artist}"
+      title: "{music_video_title}"
+      album: "{music_video_album}"
+      genre: "{music_video_genre}"
+      year: "{music_video_year}"
+      premiered: "{music_video_date}"

src/ytdl_sub/prebuilt_presets/plans.txt

@@ -1,7 +0,0 @@
-Rename presets to "Name Here"
-Have new name for presets inheret the old ones
-
-Each preset type, i.e. TV Show by Date should have one (which includes Kodi/Plex/Jellyfin), TV Show Collection separate, music ones separated
-
-for helpers, Maybe grouped, like 'video quality' for those
-bulk_initial_download probably needs its own page

src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml

@@ -45,40 +45,5 @@ presets:
       episode_file_path: "{season_directory_name_sanitized}/{episode_file_name_sanitized}"
       thumbnail_file_name: "{episode_file_path}-thumb.jpg"
 
-  _episode_video_tags:
-    video_tags:
-      show: "{tv_show_name}"
-      genre: "{tv_show_genre}"
-      episode_id: "{episode_number}"
-      title: "{episode_title}"
-      synopsis: "{episode_plot}"
-      year: "{episode_year}"
-      date: "{episode_date_standardized}"
-      contentRating: "{episode_content_rating}"
-
-  _episode_nfo_tags:
-    nfo_tags:
-      nfo_name: "{episode_file_path}.nfo"
-      nfo_root: "episodedetails"
-      tags:
-        genre:
-         - "{tv_show_genre}"
-        season: "{season_number}"
-        episode: "{episode_number}"
-        title: "{episode_title}"
-        plot: "{episode_plot}"
-        year: "{episode_year}"
-        aired: "{episode_date_standardized}"
-        mpaa: "{episode_content_rating}"
-
-    output_directory_nfo_tags:
-      nfo_name: "tvshow.nfo"
-      nfo_root: "tvshow"
-      tags:
-        title: "{tv_show_name}"
-        genre:
-         - "{tv_show_genre}"
-        mpaa: "{tv_show_content_rating}"
-
 
 

src/ytdl_sub/prebuilt_presets/tv_show/tv_show.yaml

@@ -46,4 +46,39 @@ presets:
     overrides:
       collection_season_number_padded: "{ %pad_zero(%int(collection_season_number), 2) }"
       season_number: "{collection_season_number}"
-      season_number_padded: "{collection_season_number_padded}"
+      season_number_padded: "{collection_season_number_padded}"
+
+  _episode_video_tags:
+    video_tags:
+      show: "{tv_show_name}"
+      genre: "{tv_show_genre}"
+      episode_id: "{episode_number}"
+      title: "{episode_title}"
+      synopsis: "{episode_plot}"
+      year: "{episode_year}"
+      date: "{episode_date_standardized}"
+      contentRating: "{episode_content_rating}"
+
+  _episode_nfo_tags:
+    nfo_tags:
+      nfo_name: "{episode_file_path}.nfo"
+      nfo_root: "episodedetails"
+      tags:
+        genre:
+         - "{tv_show_genre}"
+        season: "{season_number}"
+        episode: "{episode_number}"
+        title: "{episode_title}"
+        plot: "{episode_plot}"
+        year: "{episode_year}"
+        aired: "{episode_date_standardized}"
+        mpaa: "{episode_content_rating}"
+
+    output_directory_nfo_tags:
+      nfo_name: "tvshow.nfo"
+      nfo_root: "tvshow"
+      tags:
+        title: "{tv_show_name}"
+        genre:
+         - "{tv_show_genre}"
+        mpaa: "{tv_show_content_rating}"

src/ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml

@@ -1,17 +1,5 @@
 presets:
 
-  "Kodi TV Show Collection":
-    preset:
-      - kodi_tv_show_collection
-
-  "Jellyfin TV Show Collection":
-    preset:
-      - jellyfin_tv_show_collection
-
-  "Plex TV Show Collection":
-    preset:
-      - plex_tv_show_collection
-
   kodi_tv_show_collection:
     preset:
       - "_kodi_tv_show"