From 1030e493751d16f3ce589d8dc767249ae76ef79d Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 29 Dec 2023 23:10:35 -0800 Subject: [PATCH] heavily WIP again --- .../prebuilt_presets/helpers/regex.yaml | 27 ----- .../prebuilt_presets/helpers/url.yaml | 114 ------------------ .../music_videos/music_video_extras.yaml | 54 ++++++--- 3 files changed, 37 insertions(+), 158 deletions(-) delete mode 100644 src/ytdl_sub/prebuilt_presets/helpers/regex.yaml diff --git a/src/ytdl_sub/prebuilt_presets/helpers/regex.yaml b/src/ytdl_sub/prebuilt_presets/helpers/regex.yaml deleted file mode 100644 index 44d4afad..00000000 --- a/src/ytdl_sub/prebuilt_presets/helpers/regex.yaml +++ /dev/null @@ -1,27 +0,0 @@ -presets: - - ################################################################################## - # Captures metadata in the form of - # - # "value1 | value2" - # "value1" - # - # where value1 is required, value2 is optional - # - _metadata_capture: - regex: - skip_if_match_fails: False - from: - metadata_to_capture_1: - match: - - "(.*) \\| .*" - - "(.*)" - capture_group_names: - - "metadata_captured_1" - metadata_to_capture_2: - match: - - ".* \\| (.*)" - capture_group_names: - - "metadata_captured_2" - capture_group_defaults: - - "{metadata_to_capture_2_default}" \ No newline at end of file diff --git a/src/ytdl_sub/prebuilt_presets/helpers/url.yaml b/src/ytdl_sub/prebuilt_presets/helpers/url.yaml index b999aa81..239495ae 100644 --- a/src/ytdl_sub/prebuilt_presets/helpers/url.yaml +++ b/src/ytdl_sub/prebuilt_presets/helpers/url.yaml @@ -84,117 +84,3 @@ presets: url18: "{subscription_value_18}" url19: "{subscription_value_19}" url20: "{subscription_value_20}" - -################################################################################## -# Multi urls in the form of -# -# "Subscription Name": -# - "url1 metadata ..." -# - "url1" -# - "url2 metadata ..." -# - "url2" -# -# where each URL requires metadata above it. -# url1 can optionally grab channel avatar + banner -# - - _metadata_list_url: - download: - - url: "{subscription_value_2}" - variables: - url_metadata: "{subscription_value_1}" - playlist_thumbnails: - - name: "{avatar_uncropped_thumbnail_file_name}" - uid: "avatar_uncropped" - - name: "{banner_uncropped_thumbnail_file_name}" - uid: "banner_uncropped" - - url: "{subscription_value_4}" - variables: - url_metadata: "{subscription_value_3}" - - url: "{subscription_value_6}" - variables: - url_metadata: "{subscription_value_5}" - - url: "{subscription_value_8}" - variables: - url_metadata: "{subscription_value_7}" - - url: "{subscription_value_10}" - variables: - url_metadata: "{subscription_value_9}" - - url: "{subscription_value_12}" - variables: - url_metadata: "{subscription_value_11}" - - url: "{subscription_value_14}" - variables: - url_metadata: "{subscription_value_13}" - - url: "{subscription_value_16}" - variables: - url_metadata: "{subscription_value_15}" - - url: "{subscription_value_18}" - variables: - url_metadata: "{subscription_value_17}" - - url: "{subscription_value_20}" - variables: - url_metadata: "{subscription_value_19}" - - url: "{subscription_value_22}" - variables: - url_metadata: "{subscription_value_21}" - - url: "{subscription_value_24}" - variables: - url_metadata: "{subscription_value_23}" - - url: "{subscription_value_26}" - variables: - url_metadata: "{subscription_value_25}" - - url: "{subscription_value_28}" - variables: - url_metadata: "{subscription_value_27}" - - url: "{subscription_value_30}" - variables: - url_metadata: "{subscription_value_29}" - - url: "{subscription_value_32}" - variables: - url_metadata: "{subscription_value_31}" - - url: "{subscription_value_34}" - variables: - url_metadata: "{subscription_value_33}" - - url: "{subscription_value_36}" - variables: - url_metadata: "{subscription_value_35}" - overrides: - avatar_uncropped_thumbnail_file_name: "" - banner_uncropped_thumbnail_file_name: "" - subscription_value: "" - subscription_value_2: "" - subscription_value_3: "" - subscription_value_4: "" - subscription_value_5: "" - subscription_value_6: "" - subscription_value_7: "" - subscription_value_8: "" - subscription_value_9: "" - subscription_value_10: "" - subscription_value_11: "" - subscription_value_12: "" - subscription_value_13: "" - subscription_value_14: "" - subscription_value_15: "" - subscription_value_16: "" - subscription_value_17: "" - subscription_value_18: "" - subscription_value_19: "" - subscription_value_20: "" - subscription_value_21: "" - subscription_value_22: "" - subscription_value_23: "" - subscription_value_24: "" - subscription_value_25: "" - subscription_value_26: "" - subscription_value_27: "" - subscription_value_28: "" - subscription_value_29: "" - subscription_value_30: "" - subscription_value_31: "" - subscription_value_32: "" - subscription_value_33: "" - subscription_value_34: "" - subscription_value_35: "" - subscription_value_36: "" \ No newline at end of file diff --git a/src/ytdl_sub/prebuilt_presets/music_videos/music_video_extras.yaml b/src/ytdl_sub/prebuilt_presets/music_videos/music_video_extras.yaml index 9f08ecb7..c70c0b2c 100644 --- a/src/ytdl_sub/prebuilt_presets/music_videos/music_video_extras.yaml +++ b/src/ytdl_sub/prebuilt_presets/music_videos/music_video_extras.yaml @@ -1,20 +1,47 @@ +# +# Kodi Music Videos with Extras: +# + Rick Astley: +# Music Videos: +# - url1 +# - url2 +# ... +# Concerts: +# - "Custom Title | 2013 | url3" +# - url4 +# Extras: +# - url5 +# - url6 +# Behind The Scenes: +# - ... +# Live: +# - ... +# Lyrics: +# - ... + presets: _music_video_extras_base: preset: - "_music_video_base" - - "_metadata_list_url" - - "_metadata_capture" + - "_multi_url" overrides: - # Metadata is in the form of "Album Title | Video Title" - # for Plex, Album Title will serve as the suffix. For more details, see - # https://support.plex.tv/articles/205568377-adding-local-artist-and-music-videos/ - metadata_to_capture_1: "{url_metadata}" - metadata_to_capture_2: "{url_metadata}" - metadata_to_capture_2_default: "{title}" + music_videos_list: >- + { %list( %map_get(subscription_map, "Music Videos", []) ) } + concerts_list: >- + { %list( %map_get(subscription_map, "Concerts", []) ) } + extras_list: >- + { %list( %map_get(subscription_map, "Extras", []) ) } + behind_the_scenes_list: >- + { %list( %map_get(subscription_map, "Behind The Scenes", []) ) } + live_list: >- + { %list( %map_get(subscription_map, "Live", []) ) } + lyrics_list: >- + { %list( %map_get(subscription_map, "Lyrics", []) ) } - music_video_album: "{metadata_captured_1}" - music_video_title: "{metadata_captured_2}" + download: + - url: "{url1}" + variables: + music_video_type: "Music Videos" "Jellyfin Music Videos with Extras": preset: @@ -36,13 +63,6 @@ presets: - "_music_video_extras_base" - "_music_video_tags" - regex: - from: - metadata_verify_plex_suffix: - match: - - "^(?:behindthescenes|concert|interview|live|lyrics|video) \\| .*" - - "^(?:behindthescenes|concert|interview|live|lyrics|video)$" - overrides: metadata_verify_plex_suffix: "{url_metadata}" music_video_file_name_suffix: "-{music_video_album}" \ No newline at end of file