diff --git a/src/ytdl_sub/prebuilt_presets/music/music.yaml b/src/ytdl_sub/prebuilt_presets/music/music.yaml index 74db0da3..e552946a 100644 --- a/src/ytdl_sub/prebuilt_presets/music/music.yaml +++ b/src/ytdl_sub/prebuilt_presets/music/music.yaml @@ -28,15 +28,18 @@ presets: - "{track_artist}" albumartists: - "{track_album_artist}" - genre: + genres: - "{track_genre}" overrides: # MUST DEFINE: # music_directory + # Defaults + track_genre_default: "Unset" + # Subscription overrides - subscription_indent_1: "Unset" # genre + subscription_indent_1: "{track_genre_default}" url: "{subscription_value}" # Track Overrides diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml index b309f36d..53cd842d 100644 --- a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml +++ b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml @@ -23,8 +23,15 @@ presets: # season_number_padded # episode_number # episode_number_padded - subscription_indent_1: "ytdl-sub" # genre - subscription_indent_2: "TV-14" # content rating + + # Defaults + tv_show_genre_default: "ytdl-sub" + tv_show_content_rating_default: "TV-14" + + # Indents to use default values + subscription_indent_1: "{tv_show_genre_default}" + subscription_indent_2: "{tv_show_content_rating_default}" + tv_show_name: "{subscription_name}" tv_show_genre: "{subscription_indent_1}" tv_show_content_rating: "{subscription_indent_2}" diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json index 8701f73c..081b7b0f 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json @@ -1,5 +1,5 @@ { ".ytdl-sub-single_song_test-download-archive.json": "c8ff22ec3304c9f8dab18cedaed4e8b4", - "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3": "cf934f0becbc5bd8488ef4a5eb59e509", + "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3": "de33d8f05d743c1f19091ff8b0115d3d", "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/folder.jpg": "50ee47c80f679029f5d3503bb91b045a" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_best.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_best.json index 877edb7b..88c93ad0 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_best.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_best.json @@ -1,5 +1,5 @@ { ".ytdl-sub-single_song_best_test-download-archive.json": "f179ccfe0a9b3a76ae62122a3ccb58fd", - "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.m4a": "0613011371f54a80176932a9f2881941", + "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.m4a": "0144f43ed99468d8ef38c6374b8784a0", "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/folder.jpg": "50ee47c80f679029f5d3503bb91b045a" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_old_format.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_old_format.json index ea2e6f49..f687d984 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_old_format.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single_old_format.json @@ -1,5 +1,5 @@ { ".ytdl-sub-single_song_test-download-archive.json": "c8ff22ec3304c9f8dab18cedaed4e8b4", - "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3": "7affc0ecf01f36de9cee1a7aafd776eb", + "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/01 - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3": "7d0473bd154637a151210c5116a63174", "YouTube/[2019] YouTube Rewind 2019： For the Record ｜ #YouTubeRewind/folder.jpg": "50ee47c80f679029f5d3503bb91b045a" } \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt index 54b6fae0..f4b6d977 100644 --- a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt +++ b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt @@ -10,7 +10,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Double Helix Reimagined track: 1 tracktotal: 10 @@ -22,7 +22,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Skye Reimagined track: 2 tracktotal: 10 @@ -34,7 +34,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Baryofusion track: 3 tracktotal: 10 @@ -46,7 +46,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Mandalay Reimagined track: 4 tracktotal: 10 @@ -58,7 +58,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Messenger EDM Remix track: 5 tracktotal: 10 @@ -72,7 +72,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Invent the Universe track: 1 tracktotal: 10 @@ -84,7 +84,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Grand Unification (feat. David Maxim Micic) track: 2 tracktotal: 10 @@ -96,7 +96,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Expansion track: 3 tracktotal: 10 @@ -108,7 +108,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Baryogenesis track: 4 tracktotal: 10 @@ -120,7 +120,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Particles Collide (feat. Plini) track: 5 tracktotal: 10 @@ -132,7 +132,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Nucleosynthesis track: 6 tracktotal: 10 @@ -144,7 +144,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Recombination track: 7 tracktotal: 10 @@ -156,7 +156,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Dark Ages track: 8 tracktotal: 10 @@ -168,7 +168,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Formation track: 9 tracktotal: 10 @@ -180,7 +180,7 @@ Files created: albumartists: Sithu Aye artist: Sithu Aye artists: Sithu Aye - genre: Progressive Metal + genres: Progressive Metal title: Pale Blue Dot track: 10 tracktotal: 10 diff --git a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video-dry-run.txt b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video-dry-run.txt index dfa9b46e..da1da8c1 100644 --- a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video-dry-run.txt +++ b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video-dry-run.txt @@ -14,7 +14,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 01. Intro (Feat. Racheal Ofori & Barney Artist) track: 1 tracktotal: 11 @@ -30,7 +30,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 02. Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 tracktotal: 11 @@ -46,7 +46,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 03. Blaze (Feat. Kaya Thomas - Dyke) track: 3 tracktotal: 11 @@ -62,7 +62,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 04. What If (Interlude) track: 4 tracktotal: 11 @@ -78,7 +78,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 05. No Peace (Feat. Tom Misch) track: 5 tracktotal: 11 @@ -94,7 +94,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 06. Closer (Feat. Lester Duval) track: 6 tracktotal: 11 @@ -110,7 +110,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 tracktotal: 11 @@ -126,7 +126,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 08. Dreams (Feat. Carmody) track: 8 tracktotal: 11 @@ -142,7 +142,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 09. Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 tracktotal: 11 @@ -158,7 +158,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 10. Hopeful (Feat. Jordan Rakei) track: 10 tracktotal: 11 @@ -174,7 +174,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 11. Sunrise (Pillows) (Feat. Emmavie) track: 11 tracktotal: 11 diff --git a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video.txt b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video.txt index bdb80de9..128f8c6b 100644 --- a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video.txt +++ b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_video.txt @@ -13,7 +13,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 01. Intro (Feat. Racheal Ofori & Barney Artist) track: 1 tracktotal: 11 @@ -28,7 +28,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 02. Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 tracktotal: 11 @@ -43,7 +43,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 03. Blaze (Feat. Kaya Thomas - Dyke) track: 3 tracktotal: 11 @@ -58,7 +58,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 04. What If (Interlude) track: 4 tracktotal: 11 @@ -73,7 +73,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 05. No Peace (Feat. Tom Misch) track: 5 tracktotal: 11 @@ -88,7 +88,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 06. Closer (Feat. Lester Duval) track: 6 tracktotal: 11 @@ -103,7 +103,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 tracktotal: 11 @@ -118,7 +118,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 08. Dreams (Feat. Carmody) track: 8 tracktotal: 11 @@ -133,7 +133,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 09. Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 tracktotal: 11 @@ -148,7 +148,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 10. Hopeful (Feat. Jordan Rakei) track: 10 tracktotal: 11 @@ -163,7 +163,7 @@ Files created: albumartists: Proved Records artist: Proved Records artists: Proved Records - genre: Unset + genres: Unset title: 11. Sunrise (Pillows) (Feat. Emmavie) track: 11 tracktotal: 11 diff --git a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt index 8d620263..717cfb93 100644 --- a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt +++ b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt @@ -10,7 +10,7 @@ Files created: albumartists: Project Zombie artist: Project Zombie artists: Project Zombie - genre: Unset + genres: Unset title: Oblivion Mod "Falcor" p.1 track: 1 tracktotal: 1 diff --git a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video-dry-run.txt b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video-dry-run.txt index 98cf227c..04afc59c 100644 --- a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video-dry-run.txt +++ b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video-dry-run.txt @@ -14,7 +14,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Intro (Feat. Racheal Ofori & Barney Artist) track: 1 tracktotal: 11 @@ -30,7 +30,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 tracktotal: 11 @@ -46,7 +46,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Blaze (Feat. Kaya Thomas - Dyke) track: 3 tracktotal: 11 @@ -62,7 +62,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: What If (Interlude) track: 4 tracktotal: 11 @@ -78,7 +78,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: No Peace (Feat. Tom Misch) track: 5 tracktotal: 11 @@ -94,7 +94,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Closer (Feat. Lester Duval) track: 6 tracktotal: 11 @@ -110,7 +110,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 tracktotal: 11 @@ -126,7 +126,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Dreams (Feat. Carmody) track: 8 tracktotal: 11 @@ -142,7 +142,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 tracktotal: 11 @@ -158,7 +158,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Hopeful (Feat. Jordan Rakei) track: 10 tracktotal: 11 @@ -174,7 +174,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Sunrise (Pillows) (Feat. Emmavie) track: 11 tracktotal: 11 diff --git a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video.txt b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video.txt index 59cd59ac..619ff263 100644 --- a/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video.txt +++ b/tests/resources/transaction_log_summaries/plugins/split_by_chapters_with_regex_video.txt @@ -13,7 +13,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Intro (Feat. Racheal Ofori & Barney Artist) track: 1 tracktotal: 11 @@ -28,7 +28,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 tracktotal: 11 @@ -43,7 +43,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Blaze (Feat. Kaya Thomas - Dyke) track: 3 tracktotal: 11 @@ -58,7 +58,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: What If (Interlude) track: 4 tracktotal: 11 @@ -73,7 +73,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: No Peace (Feat. Tom Misch) track: 5 tracktotal: 11 @@ -88,7 +88,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Closer (Feat. Lester Duval) track: 6 tracktotal: 11 @@ -103,7 +103,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 tracktotal: 11 @@ -118,7 +118,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Dreams (Feat. Carmody) track: 8 tracktotal: 11 @@ -133,7 +133,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 tracktotal: 11 @@ -148,7 +148,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Hopeful (Feat. Jordan Rakei) track: 10 tracktotal: 11 @@ -163,7 +163,7 @@ Files created: albumartists: Alfa Mist artist: Alfa Mist artists: Alfa Mist - genre: Unset + genres: Unset title: Sunrise (Pillows) (Feat. Emmavie) track: 11 tracktotal: 11 diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt index df0fbecd..385763f2 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt @@ -10,7 +10,7 @@ Files created: albumartists: Project Zombie artist: Project Zombie artists: Project Zombie - genre: Unset + genres: Unset title: Jesse's Minecraft Server [Trailer - Mar.21] track: 1 tracktotal: 3 @@ -22,7 +22,7 @@ Files created: albumartists: Project Zombie artist: Project Zombie artists: Project Zombie - genre: Unset + genres: Unset title: Jesse's Minecraft Server [Trailer - Feb.27] track: 2 tracktotal: 3 @@ -34,7 +34,7 @@ Files created: albumartists: Project Zombie artist: Project Zombie artists: Project Zombie - genre: Unset + genres: Unset title: Jesse's Minecraft Server [Trailer - Feb.1] track: 3 tracktotal: 3 diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt index 3a12643e..914485d4 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt @@ -10,8 +10,8 @@ Files created: albumartists: YouTube artist: YouTube artists: YouTube - genre: Unset genres: + - Unset - multi_tag_1 - multi_tag_2 title: YouTube Rewind 2019: For the Record | #YouTubeRewind diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best.txt index 9ae37e69..9b538e8d 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best.txt @@ -10,8 +10,8 @@ Files created: albumartists: YouTube artist: YouTube artists: YouTube - genre: Unset genres: + - Unset - multi_tag_1 - multi_tag_2 title: YouTube Rewind 2019: For the Record | #YouTubeRewind diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best_dry_run.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best_dry_run.txt index dcc32ffa..23662d3e 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best_dry_run.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_best_dry_run.txt @@ -11,8 +11,8 @@ Files created: albumartists: YouTube artist: YouTube artists: YouTube - genre: Unset genres: + - Unset - multi_tag_1 - multi_tag_2 title: YouTube Rewind 2019: For the Record | #YouTubeRewind diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_old_format.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_old_format.txt index 6327e106..9a8b14bd 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_old_format.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single_old_format.txt @@ -10,10 +10,7 @@ Files created: albumartists: YouTube artist: YouTube artists: YouTube - genre: Unset - genres: - - multi_tag_1 - - multi_tag_2 + genres: Unset title: YouTube Rewind 2019: For the Record | #YouTubeRewind track: 1 tracktotal: 1 diff --git a/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt b/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt index 246601a9..1a2ab30c 100644 --- a/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt +++ b/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt @@ -10,7 +10,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: Baby Santana's Dorian Groove track: 1 tracktotal: 1 @@ -24,7 +24,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: Purple Clouds track: 1 tracktotal: 1 @@ -38,7 +38,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20160426 184214 track: 1 tracktotal: 11 @@ -50,7 +50,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20160502 123150 track: 2 tracktotal: 11 @@ -62,7 +62,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20160504 143832 track: 3 tracktotal: 11 @@ -74,7 +74,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20160601 221234 track: 4 tracktotal: 11 @@ -86,7 +86,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20160601 222440 track: 5 tracktotal: 11 @@ -98,7 +98,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20170604 190236 track: 6 tracktotal: 11 @@ -110,7 +110,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20170612 193646 track: 7 tracktotal: 11 @@ -122,7 +122,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: 20170628 215206 track: 8 tracktotal: 11 @@ -134,7 +134,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: Finding Home track: 9 tracktotal: 11 @@ -146,7 +146,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: Shallow Water WIP track: 10 tracktotal: 11 @@ -158,7 +158,7 @@ Files created: albumartists: j_b artist: j_b artists: j_b - genre: Acoustic + genres: Acoustic title: Untold History track: 11 tracktotal: 11 diff --git a/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt b/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt index 5ae093e3..669e1bda 100644 --- a/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt +++ b/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt @@ -10,7 +10,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-1 track: 2 tracktotal: 4 @@ -22,7 +22,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-2 track: 3 tracktotal: 4 @@ -34,7 +34,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-3 track: 4 tracktotal: 4 @@ -48,7 +48,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 21-1 track: 1 tracktotal: 4 diff --git a/tests/resources/transaction_log_summaries/unit/music/Single.txt b/tests/resources/transaction_log_summaries/unit/music/Single.txt index 2bf50619..b0dd752b 100644 --- a/tests/resources/transaction_log_summaries/unit/music/Single.txt +++ b/tests/resources/transaction_log_summaries/unit/music/Single.txt @@ -10,7 +10,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-1 track: 1 tracktotal: 1 @@ -24,7 +24,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-2 track: 1 tracktotal: 1 @@ -38,7 +38,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-3 track: 1 tracktotal: 1 @@ -52,7 +52,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 21-1 track: 1 tracktotal: 1 diff --git a/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt b/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt index fdee3723..1e762076 100644 --- a/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt +++ b/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt @@ -10,7 +10,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-1 track: 2 tracktotal: 4 @@ -22,7 +22,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-2 track: 3 tracktotal: 4 @@ -34,7 +34,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-3 track: 4 tracktotal: 4 @@ -48,7 +48,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-4 track: 1 tracktotal: 1 @@ -62,7 +62,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-5 track: 1 tracktotal: 1 @@ -76,7 +76,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-6 track: 1 tracktotal: 1 @@ -90,7 +90,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-7 track: 1 tracktotal: 1 @@ -104,7 +104,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 21-1 track: 1 tracktotal: 4 diff --git a/tests/resources/transaction_log_summaries/unit/music/YouTube Full Albums.txt b/tests/resources/transaction_log_summaries/unit/music/YouTube Full Albums.txt index 2bf50619..b0dd752b 100644 --- a/tests/resources/transaction_log_summaries/unit/music/YouTube Full Albums.txt +++ b/tests/resources/transaction_log_summaries/unit/music/YouTube Full Albums.txt @@ -10,7 +10,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-1 track: 1 tracktotal: 1 @@ -24,7 +24,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-2 track: 1 tracktotal: 1 @@ -38,7 +38,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-3 track: 1 tracktotal: 1 @@ -52,7 +52,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 21-1 track: 1 tracktotal: 1 diff --git a/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt b/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt index 5ae093e3..669e1bda 100644 --- a/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt +++ b/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt @@ -10,7 +10,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-1 track: 2 tracktotal: 4 @@ -22,7 +22,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-2 track: 3 tracktotal: 4 @@ -34,7 +34,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 20-3 track: 4 tracktotal: 4 @@ -48,7 +48,7 @@ Files created: albumartists: subscription_test artist: subscription_test artists: subscription_test - genre: Unset + genres: Unset title: Mock Entry 21-1 track: 1 tracktotal: 4