diff --git a/examples/music_audio_subscriptions.yaml b/examples/music_audio_subscriptions.yaml index 7786664a..1c9f7861 100644 --- a/examples/music_audio_subscriptions.yaml +++ b/examples/music_audio_subscriptions.yaml @@ -45,33 +45,6 @@ game_chops: track_title: "{captured_track_title}" -#################################################################################################### -# BANDCAMP - DISCOGRAPHY -# See https://emilyharpist.bandcamp.com/ -# -# Downloads the GameChops Albums' playlist. Each video in the playlist is an album with -# chapters representing songs. -emily_hopkins: - preset: "albums_from_playlists" - regex: - from: - title: - match: - - "^Emily Hopkins - (.*)" # Captures 'title' from 'Emily Hopkins - title' - capture_group_names: - - "captured_track_title" - capture_group_defaults: - - "{title}" - - # Explicitly set the URL, track artist, and genre. - # Override various track properties using the regex variables we extracted. - overrides: - url: "https://emilyharpist.bandcamp.com/" - track_artist: "Emily Hopkins" - track_genre: "Lofi" - track_title: "{captured_track_title}" - - #################################################################################################### # YOUTUBE - MANY ALBUMS FROM MANY ARTISTS UPLOADED BY A CHANNEL # See https://www.youtube.com/@heavymetalofeasternbloc @@ -117,4 +90,49 @@ eastern_bloc: track_album: "{captured_track_album}" track_title: "{captured_track_title}" track_year: "{captured_track_year}" - track_genre: "Eastern Bloc {captured_track_genre}" \ No newline at end of file + track_genre: "Eastern Bloc {captured_track_genre}" + + +#################################################################################################### +# BANDCAMP - DISCOGRAPHY +# See https://emilyharpist.bandcamp.com/ +# +# Downloads the GameChops Albums' playlist. Each video in the playlist is an album with +# chapters representing songs. +emily_hopkins: + preset: "albums_from_playlists" + regex: + from: + title: + match: + - "^Emily Hopkins - (.*)" # Captures 'title' from 'Emily Hopkins - title' + capture_group_names: + - "captured_track_title" + capture_group_defaults: + - "{title}" + + # Explicitly set the URL, track artist, and genre. + # Override various track properties using the regex variables we extracted. + overrides: + url: "https://emilyharpist.bandcamp.com/" + track_artist: "Emily Hopkins" + track_genre: "Lofi" + track_title: "{captured_track_title}" + + +#################################################################################################### +# SOUNDCLOUD - DISCOGRAPHY +# See https://soundcloud.com/jessebannon +# +# Downloads my acoustic 'album' and various tracks from SoundCloud using the soundcloud +# discography preset. I'm not very good so keep your expectations low :-) +jmbannon: + # Inherit soundcloud_discography preset + preset: "soundcloud_discography" + + # Explicitly set the SoundCloud artist url, track artist, and genre. + overrides: + sc_artist_url: "sc_artist_url" + track_artist: "jmbannon" + track_genre: "Acoustic" + diff --git a/tests/e2e/plugins/test_audio_extract.py b/tests/e2e/plugins/test_audio_extract.py index 7e7a4758..1a3563c7 100644 --- a/tests/e2e/plugins/test_audio_extract.py +++ b/tests/e2e/plugins/test_audio_extract.py @@ -19,7 +19,7 @@ def single_song_preset_dict(output_directory): "overrides": { "url": "https://www.youtube.com/watch?v=2lAe1cqCOXo", "music_directory": output_directory, - } + }, } @@ -36,7 +36,7 @@ def multiple_songs_preset_dict(output_directory): "overrides": { "url": "https://youtube.com/playlist?list=PL5BC0FC26BECA5A35", "music_directory": output_directory, - } + }, } diff --git a/tests/e2e/plugins/test_split_by_chapters.py b/tests/e2e/plugins/test_split_by_chapters.py index 60e77a36..4151ab71 100644 --- a/tests/e2e/plugins/test_split_by_chapters.py +++ b/tests/e2e/plugins/test_split_by_chapters.py @@ -12,15 +12,16 @@ from ytdl_sub.utils.exceptions import ValidationException @pytest.fixture def yt_album_as_chapters_preset_dict(output_directory): return { - "preset": "album_from_chapters", - "download": {"url": "https://www.youtube.com/watch?v=zeR2_YjlXWA"}, - # override the output directory with our fixture-generated dir - "output_options": {"output_directory": output_directory, "maintain_download_archive": True}, + "preset": "albums_from_chapters", # download the worst format so it is fast "ytdl_options": { "format": "worst[ext=mp4]", "postprocessor_args": {"ffmpeg": ["-bitexact"]}, # Must add this for reproducibility }, + "overrides": { + "url": "https://www.youtube.com/watch?v=zeR2_YjlXWA", + "music_directory": output_directory, + }, } @@ -33,7 +34,7 @@ def yt_album_as_chapters_with_regex_preset_dict(yt_album_as_chapters_preset_dict "from": { "chapter_title": { "match": r"\d+\. (.+)", - "capture_group_names": "captured_chapter_title", + "capture_group_names": "captured_track_title", "capture_group_defaults": "{chapter_title}", }, "title": { @@ -42,8 +43,8 @@ def yt_album_as_chapters_with_regex_preset_dict(yt_album_as_chapters_preset_dict "(.+) - (.+)", ], "capture_group_names": [ - "captured_artist", - "captured_album", + "captured_track_artist", + "captured_track_album", ], "capture_group_defaults": [ "{channel}", @@ -53,9 +54,9 @@ def yt_album_as_chapters_with_regex_preset_dict(yt_album_as_chapters_preset_dict } }, "overrides": { - "custom_track_name": "{captured_chapter_title}", - "custom_album_name": "{captured_album}", - "custom_artist_name": "{captured_artist}", + "track_title": "{captured_track_title}", + "track_album": "{captured_track_album}", + "track_artist": "{captured_track_artist}", }, }, ) diff --git a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_video.json b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_video.json index 722ce4c0..d6d127fc 100644 --- a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_video.json +++ b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_video.json @@ -1,15 +1,15 @@ { - ".ytdl-sub-split_by_chapters_video-download-archive.json": "7001417f7a398959f3296ece81575a77", - "Alfa Mist - Nocturne [Full Album]/01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3": "87d036987c4903e62e4f5001ea38a49a", - "Alfa Mist - Nocturne [Full Album]/02 - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "96975f139dcc87a05dec03ab4f839d94", - "Alfa Mist - Nocturne [Full Album]/03 - 03. Blaze (Feat. Kaya Thomas - Dyke).mp3": "58df7bb835d05e3cb0e28abb4c784a5e", - "Alfa Mist - Nocturne [Full Album]/04 - 04. What If (Interlude).mp3": "d8313eb888dc3c8109623c84139280e7", - "Alfa Mist - Nocturne [Full Album]/05 - 05. No Peace (Feat. Tom Misch).mp3": "4c6ee32b371e6e5374c722f4c854a965", - "Alfa Mist - Nocturne [Full Album]/06 - 06. Closer (Feat. Lester Duval).mp3": "d54280bca884ddc1a0614b00c2d70ea3", - "Alfa Mist - Nocturne [Full Album]/07 - 07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3": "61943dfb29ca40069969790773bf3cd9", - "Alfa Mist - Nocturne [Full Album]/08 - 08. Dreams (Feat. Carmody).mp3": "c37001fb9f3c0cca1bffdf3b2ae4a0fc", - "Alfa Mist - Nocturne [Full Album]/09 - 09. Dreaming (Interlude) (Feat. Racheal Ofori).mp3": "5334aa0af6ce2ec1283806cf7d9a15c1", - "Alfa Mist - Nocturne [Full Album]/10 - 10. Hopeful (Feat. Jordan Rakei).mp3": "526d70f88ab03b972c06243f164d4b0e", - "Alfa Mist - Nocturne [Full Album]/11 - 11. Sunrise (Pillows) (Feat. Emmavie).mp3": "8376927e5cecf6bed63f016649b77354", - "Alfa Mist - Nocturne [Full Album]/folder.jpg": "bd3685acc53072e591bae2505ecb0648" + ".ytdl-sub-split_by_chapters_video-download-archive.json": "5e7a31ec4a73e71696f8f3ba9eab9303", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3": "29d09da874133ce5c5f7459c2fa6cd85", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/02 - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "d5432e6a4f7af9810b0e7c8eebe4898a", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/03 - 03. Blaze (Feat. Kaya Thomas - Dyke).mp3": "cf03da6688a73373f9295dc595156e11", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/04 - 04. What If (Interlude).mp3": "b7b943b6f3395c05433b8532364d63d6", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/05 - 05. No Peace (Feat. Tom Misch).mp3": "0d9719268900d4abcd8c0f51ad3af92c", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/06 - 06. Closer (Feat. Lester Duval).mp3": "bbd9ec616a0f7d3c5d13c04bb118681e", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/07 - 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3": "2e59ecdc0f8050bcf190a7898d7ae968", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/08 - 08. Dreams (Feat. Carmody).mp3": "e58966f3326b876f0ab97459b681f76f", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/09 - 09. Dreaming (Interlude) (Feat. Racheal Ofori).mp3": "d6939215b73457fce4e026f8c9b57ecc", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/10 - 10. Hopeful (Feat. Jordan Rakei).mp3": "82d0e7d8070fd15d71c2e11c0285d426", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/11 - 11. Sunrise (Pillows) (Feat. Emmavie).mp3": "3edb11e8cd5f270dd42ee62d9a9aa4ff", + "Proved Records/[2017] Alfa Mist - Nocturne [Full Album]/folder.jpg": "bd3685acc53072e591bae2505ecb0648" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt index cfcf6f35..1fc7f0fb 100644 --- a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt +++ b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_no_chapters_video_pass.txt @@ -1,5 +1,5 @@ { - ".ytdl-sub-split_by_chapters_with_regex_video-download-archive.json": "11367ac13068646e35a53d25deeba834", - "Oblivion Mod ＂Falcor＂ p.1/01 - Oblivion Mod ＂Falcor＂ p.1.mp3": "dfcf5aed1742bd55e562a0d93e555f01", - "Oblivion Mod ＂Falcor＂ p.1/folder.jpg": "fb95b510681676e81c321171fc23143e" + ".ytdl-sub-split_by_chapters_with_regex_video-download-archive.json": "ed212171889707bf65462878248fc0b8", + "Project Zombie/[2010] Oblivion Mod \"Falcor\" p.1/01 - Oblivion Mod \"Falcor\" p.1.mp3": "a3c01f164eeca4541aeed49264d2fc8c", + "Project Zombie/[2010] Oblivion Mod \"Falcor\" p.1/folder.jpg": "fb95b510681676e81c321171fc23143e" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_video.json b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_video.json index 77cb9a09..cf27b650 100644 --- a/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_video.json +++ b/tests/resources/expected_downloads_summaries/plugins/split_by_chapters_with_regex_video.json @@ -1,15 +1,15 @@ { - ".ytdl-sub-split_by_chapters_with_regex_video-download-archive.json": "5f281991d441f406b0d721b250e74b79", - "Nocturne/01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3": "1f51d6809509904b51ad8930d9bb49b0", - "Nocturne/02 - Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "16ba92db30c7199373855d0ed6d2cdde", - "Nocturne/03 - Blaze (Feat. Kaya Thomas - Dyke).mp3": "21af1894554dc61f437b191a6702c274", - "Nocturne/04 - What If (Interlude).mp3": "b6cab2cfcbcb3807eb8176281960e9be", - "Nocturne/05 - No Peace (Feat. Tom Misch).mp3": "56ae7656dc6edca4e55e0afc9422002a", - "Nocturne/06 - Closer (Feat. Lester Duval).mp3": "93e7025813924670595032c3a2038d94", - "Nocturne/07 - Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3": "b757d50d7ad154fe36d13ae72a05a744", - "Nocturne/08 - Dreams (Feat. Carmody).mp3": "de1e9313623368a9c7e63a08d77ca54b", - "Nocturne/09 - Dreaming (Interlude) (Feat. Racheal Ofori).mp3": "264e0a6c3e572e05daffc38bf8178226", - "Nocturne/10 - Hopeful (Feat. Jordan Rakei).mp3": "e72408d03604ff928acf6ce4b383895c", - "Nocturne/11 - Sunrise (Pillows) (Feat. Emmavie).mp3": "146d981480be3bf28726a27443c1695a", - "Nocturne/folder.jpg": "bd3685acc53072e591bae2505ecb0648" + ".ytdl-sub-split_by_chapters_with_regex_video-download-archive.json": "cb82ae5ed9d7a41aea15446254c93738", + "Alfa Mist/[2017] Nocturne/01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3": "7be57c4dde9ba2c3fa72e9cc65b0f586", + "Alfa Mist/[2017] Nocturne/02 - Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "5ee032da9965c51913fcfa0319d061bd", + "Alfa Mist/[2017] Nocturne/03 - Blaze (Feat. Kaya Thomas - Dyke).mp3": "82c1f35bdccfb4ec146f33661ac94d6b", + "Alfa Mist/[2017] Nocturne/04 - What If (Interlude).mp3": "040b38c249e478d8832dcea8bfeca17f", + "Alfa Mist/[2017] Nocturne/05 - No Peace (Feat. Tom Misch).mp3": "06f7e57fecdc7b4d2e37c7652791ce19", + "Alfa Mist/[2017] Nocturne/06 - Closer (Feat. Lester Duval).mp3": "91a03449c33bf9dcff5a9654a8525626", + "Alfa Mist/[2017] Nocturne/07 - Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3": "54c26621b8d4e74f37217c836479a077", + "Alfa Mist/[2017] Nocturne/08 - Dreams (Feat. Carmody).mp3": "2704327ac5998086e77a77da164e2afd", + "Alfa Mist/[2017] Nocturne/09 - Dreaming (Interlude) (Feat. Racheal Ofori).mp3": "75b8a26d3099aa2d9ba488b33c4eb1e7", + "Alfa Mist/[2017] Nocturne/10 - Hopeful (Feat. Jordan Rakei).mp3": "0bf0979c99c55ef986efaba55c0dc858", + "Alfa Mist/[2017] Nocturne/11 - Sunrise (Pillows) (Feat. Emmavie).mp3": "78950fbfe459de8e9aa951ab6fa153bf", + "Alfa Mist/[2017] Nocturne/folder.jpg": "bd3685acc53072e591bae2505ecb0648" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json index 2ff866ba..890aca91 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json @@ -1,5 +1,7 @@ { - "Jesse's Minecraft Server [Trailer - Feb.1].ogg": "e0ab90ea97f26738195111de2fbf0f5f", - "Jesse's Minecraft Server [Trailer - Feb.27].ogg": "814bdd627fbd4b55017341ffdec9da9d", - "Jesse's Minecraft Server [Trailer - Mar.21].ogg": "90303a47a312c27cf8eed56bf09aa526" + ".ytdl-sub-multiple_songs_test-download-archive.json": "54237df5e00d1598dfd39f341ee03d75", + "Project Zombie/[2011] Jesse's Minecraft Server/01 - Jesse's Minecraft Server [Trailer - Mar.21].ogg": "5657c5b92f8980b20d8bbee0fdc7e5d8", + "Project Zombie/[2011] Jesse's Minecraft Server/02 - Jesse's Minecraft Server [Trailer - Feb.27].ogg": "a2a3a34e02e26a6c0265530d4499473b", + "Project Zombie/[2011] Jesse's Minecraft Server/03 - Jesse's Minecraft Server [Trailer - Feb.1].ogg": "b2d6388b4ddf8e3fbca042cb123672c3", + "Project Zombie/[2011] Jesse's Minecraft Server/folder.jpg": "e7830aa8a64b0cde65ba3f7e5fc56530" } \ No newline at end of file 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 fa8d8c8a..879f3cdc 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,4 +1,5 @@ { - "YouTube/[2019] Singles/01 - YouTube Rewind 2019: For the Record | #YouTubeRewind.mp3": "c70b478ca98f5752e9475ccadcec3227", - "YouTube/[2019] Singles/folder.jpg": "50ee47c80f679029f5d3503bb91b045a" + ".ytdl-sub-single_song_test-download-archive.json": "22c1431e35033d777a674c4802bcc786", + "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/folder.jpg": "50ee47c80f679029f5d3503bb91b045a" } \ No newline at end of file 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 1b42d8b5..484abb08 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 @@ -2,7 +2,7 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-split_by_chapters_video-download-archive.json -{output_directory}/Alfa Mist - Nocturne [Full Album] +{output_directory}/Proved Records/[2017] Alfa Mist - Nocturne [Full Album] 01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: Warning: Dry-run assumes embedded chapters with no modifications @@ -17,6 +17,7 @@ Files created: genre: Unset title: 01. Intro (Feat. Racheal Ofori & Barney Artist) track: 1 + tracktotal: 11 year: 2017 02 - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -32,6 +33,7 @@ Files created: genre: Unset title: 02. Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 + tracktotal: 11 year: 2017 03 - 03. Blaze (Feat. Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -47,6 +49,7 @@ Files created: genre: Unset title: 03. Blaze (Feat. Kaya Thomas - Dyke) track: 3 + tracktotal: 11 year: 2017 04 - 04. What If (Interlude).mp3 From Chapter Split: @@ -62,6 +65,7 @@ Files created: genre: Unset title: 04. What If (Interlude) track: 4 + tracktotal: 11 year: 2017 05 - 05. No Peace (Feat. Tom Misch).mp3 From Chapter Split: @@ -77,6 +81,7 @@ Files created: genre: Unset title: 05. No Peace (Feat. Tom Misch) track: 5 + tracktotal: 11 year: 2017 06 - 06. Closer (Feat. Lester Duval).mp3 From Chapter Split: @@ -92,8 +97,9 @@ Files created: genre: Unset title: 06. Closer (Feat. Lester Duval) track: 6 + tracktotal: 11 year: 2017 - 07 - 07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3 + 07 - 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: Warning: Dry-run assumes embedded chapters with no modifications Source Title: Alfa Mist - Nocturne [Full Album] @@ -107,6 +113,7 @@ Files created: genre: Unset title: 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 + tracktotal: 11 year: 2017 08 - 08. Dreams (Feat. Carmody).mp3 From Chapter Split: @@ -122,6 +129,7 @@ Files created: genre: Unset title: 08. Dreams (Feat. Carmody) track: 8 + tracktotal: 11 year: 2017 09 - 09. Dreaming (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: @@ -137,6 +145,7 @@ Files created: genre: Unset title: 09. Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 + tracktotal: 11 year: 2017 10 - 10. Hopeful (Feat. Jordan Rakei).mp3 From Chapter Split: @@ -152,6 +161,7 @@ Files created: genre: Unset title: 10. Hopeful (Feat. Jordan Rakei) track: 10 + tracktotal: 11 year: 2017 11 - 11. Sunrise (Pillows) (Feat. Emmavie).mp3 From Chapter Split: @@ -167,5 +177,6 @@ Files created: genre: Unset title: 11. Sunrise (Pillows) (Feat. Emmavie) track: 11 + tracktotal: 11 year: 2017 folder.jpg \ No newline at end of file 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 5616f6e5..5b82af0b 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 @@ -2,7 +2,7 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-split_by_chapters_video-download-archive.json -{output_directory}/Alfa Mist - Nocturne [Full Album] +{output_directory}/Proved Records/[2017] Alfa Mist - Nocturne [Full Album] 01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: Source Title: Alfa Mist - Nocturne [Full Album] @@ -16,6 +16,7 @@ Files created: genre: Unset title: 01. Intro (Feat. Racheal Ofori & Barney Artist) track: 1 + tracktotal: 11 year: 2017 02 - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -30,6 +31,7 @@ Files created: genre: Unset title: 02. Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 + tracktotal: 11 year: 2017 03 - 03. Blaze (Feat. Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -44,6 +46,7 @@ Files created: genre: Unset title: 03. Blaze (Feat. Kaya Thomas - Dyke) track: 3 + tracktotal: 11 year: 2017 04 - 04. What If (Interlude).mp3 From Chapter Split: @@ -58,6 +61,7 @@ Files created: genre: Unset title: 04. What If (Interlude) track: 4 + tracktotal: 11 year: 2017 05 - 05. No Peace (Feat. Tom Misch).mp3 From Chapter Split: @@ -72,6 +76,7 @@ Files created: genre: Unset title: 05. No Peace (Feat. Tom Misch) track: 5 + tracktotal: 11 year: 2017 06 - 06. Closer (Feat. Lester Duval).mp3 From Chapter Split: @@ -86,8 +91,9 @@ Files created: genre: Unset title: 06. Closer (Feat. Lester Duval) track: 6 + tracktotal: 11 year: 2017 - 07 - 07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3 + 07 - 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: Source Title: Alfa Mist - Nocturne [Full Album] Segment: 17:57 - 20:05 @@ -100,6 +106,7 @@ Files created: genre: Unset title: 07. Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 + tracktotal: 11 year: 2017 08 - 08. Dreams (Feat. Carmody).mp3 From Chapter Split: @@ -114,6 +121,7 @@ Files created: genre: Unset title: 08. Dreams (Feat. Carmody) track: 8 + tracktotal: 11 year: 2017 09 - 09. Dreaming (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: @@ -128,6 +136,7 @@ Files created: genre: Unset title: 09. Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 + tracktotal: 11 year: 2017 10 - 10. Hopeful (Feat. Jordan Rakei).mp3 From Chapter Split: @@ -142,6 +151,7 @@ Files created: genre: Unset title: 10. Hopeful (Feat. Jordan Rakei) track: 10 + tracktotal: 11 year: 2017 11 - 11. Sunrise (Pillows) (Feat. Emmavie).mp3 From Chapter Split: @@ -156,5 +166,6 @@ Files created: genre: Unset title: 11. Sunrise (Pillows) (Feat. Emmavie) track: 11 + tracktotal: 11 year: 2017 folder.jpg \ No newline at end of file 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 83862bf3..98f22142 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 @@ -2,8 +2,8 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-split_by_chapters_with_regex_video-download-archive.json -{output_directory}/Oblivion Mod ＂Falcor＂ p.1 - 01 - Oblivion Mod ＂Falcor＂ p.1.mp3 +{output_directory}/Project Zombie/[2010] Oblivion Mod "Falcor" p.1 + 01 - Oblivion Mod "Falcor" p.1.mp3 Music Tags: album: Oblivion Mod "Falcor" p.1 albumartist: Project Zombie @@ -13,5 +13,6 @@ Files created: genre: Unset title: Oblivion Mod "Falcor" p.1 track: 1 + tracktotal: 1 year: 2010 folder.jpg \ No newline at end of file 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 f86ef1f5..1e39241c 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 @@ -2,7 +2,7 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-split_by_chapters_with_regex_video-download-archive.json -{output_directory}/Nocturne +{output_directory}/Alfa Mist/[2017] Nocturne 01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: Warning: Dry-run assumes embedded chapters with no modifications @@ -17,6 +17,7 @@ Files created: genre: Unset title: Intro (Feat. Racheal Ofori & Barney Artist) track: 1 + tracktotal: 11 year: 2017 02 - Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -32,6 +33,7 @@ Files created: genre: Unset title: Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 + tracktotal: 11 year: 2017 03 - Blaze (Feat. Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -47,6 +49,7 @@ Files created: genre: Unset title: Blaze (Feat. Kaya Thomas - Dyke) track: 3 + tracktotal: 11 year: 2017 04 - What If (Interlude).mp3 From Chapter Split: @@ -62,6 +65,7 @@ Files created: genre: Unset title: What If (Interlude) track: 4 + tracktotal: 11 year: 2017 05 - No Peace (Feat. Tom Misch).mp3 From Chapter Split: @@ -77,6 +81,7 @@ Files created: genre: Unset title: No Peace (Feat. Tom Misch) track: 5 + tracktotal: 11 year: 2017 06 - Closer (Feat. Lester Duval).mp3 From Chapter Split: @@ -92,8 +97,9 @@ Files created: genre: Unset title: Closer (Feat. Lester Duval) track: 6 + tracktotal: 11 year: 2017 - 07 - Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3 + 07 - Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: Warning: Dry-run assumes embedded chapters with no modifications Source Title: Alfa Mist - Nocturne [Full Album] @@ -107,6 +113,7 @@ Files created: genre: Unset title: Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 + tracktotal: 11 year: 2017 08 - Dreams (Feat. Carmody).mp3 From Chapter Split: @@ -122,6 +129,7 @@ Files created: genre: Unset title: Dreams (Feat. Carmody) track: 8 + tracktotal: 11 year: 2017 09 - Dreaming (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: @@ -137,6 +145,7 @@ Files created: genre: Unset title: Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 + tracktotal: 11 year: 2017 10 - Hopeful (Feat. Jordan Rakei).mp3 From Chapter Split: @@ -152,6 +161,7 @@ Files created: genre: Unset title: Hopeful (Feat. Jordan Rakei) track: 10 + tracktotal: 11 year: 2017 11 - Sunrise (Pillows) (Feat. Emmavie).mp3 From Chapter Split: @@ -167,5 +177,6 @@ Files created: genre: Unset title: Sunrise (Pillows) (Feat. Emmavie) track: 11 + tracktotal: 11 year: 2017 folder.jpg \ No newline at end of file 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 e6233833..4ecea103 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 @@ -2,7 +2,7 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-split_by_chapters_with_regex_video-download-archive.json -{output_directory}/Nocturne +{output_directory}/Alfa Mist/[2017] Nocturne 01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: Source Title: Alfa Mist - Nocturne [Full Album] @@ -16,6 +16,7 @@ Files created: genre: Unset title: Intro (Feat. Racheal Ofori & Barney Artist) track: 1 + tracktotal: 11 year: 2017 02 - Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -30,6 +31,7 @@ Files created: genre: Unset title: Answers (Feat. Rick David & Kaya Thomas - Dyke) track: 2 + tracktotal: 11 year: 2017 03 - Blaze (Feat. Kaya Thomas - Dyke).mp3 From Chapter Split: @@ -44,6 +46,7 @@ Files created: genre: Unset title: Blaze (Feat. Kaya Thomas - Dyke) track: 3 + tracktotal: 11 year: 2017 04 - What If (Interlude).mp3 From Chapter Split: @@ -58,6 +61,7 @@ Files created: genre: Unset title: What If (Interlude) track: 4 + tracktotal: 11 year: 2017 05 - No Peace (Feat. Tom Misch).mp3 From Chapter Split: @@ -72,6 +76,7 @@ Files created: genre: Unset title: No Peace (Feat. Tom Misch) track: 5 + tracktotal: 11 year: 2017 06 - Closer (Feat. Lester Duval).mp3 From Chapter Split: @@ -86,8 +91,9 @@ Files created: genre: Unset title: Closer (Feat. Lester Duval) track: 6 + tracktotal: 11 year: 2017 - 07 - Delusions： Rumination (Interlude) (Feat. Racheal Ofori).mp3 + 07 - Delusions: Rumination (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: Source Title: Alfa Mist - Nocturne [Full Album] Segment: 17:57 - 20:05 @@ -100,6 +106,7 @@ Files created: genre: Unset title: Delusions: Rumination (Interlude) (Feat. Racheal Ofori) track: 7 + tracktotal: 11 year: 2017 08 - Dreams (Feat. Carmody).mp3 From Chapter Split: @@ -114,6 +121,7 @@ Files created: genre: Unset title: Dreams (Feat. Carmody) track: 8 + tracktotal: 11 year: 2017 09 - Dreaming (Interlude) (Feat. Racheal Ofori).mp3 From Chapter Split: @@ -128,6 +136,7 @@ Files created: genre: Unset title: Dreaming (Interlude) (Feat. Racheal Ofori) track: 9 + tracktotal: 11 year: 2017 10 - Hopeful (Feat. Jordan Rakei).mp3 From Chapter Split: @@ -142,6 +151,7 @@ Files created: genre: Unset title: Hopeful (Feat. Jordan Rakei) track: 10 + tracktotal: 11 year: 2017 11 - Sunrise (Pillows) (Feat. Emmavie).mp3 From Chapter Split: @@ -156,5 +166,6 @@ Files created: genre: Unset title: Sunrise (Pillows) (Feat. Emmavie) track: 11 + tracktotal: 11 year: 2017 folder.jpg \ No newline at end of file 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 ab4be55f..df0fbecd 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 @@ -1,31 +1,11 @@ Files created: ---------------------------------------- {output_directory} - Jesse's Minecraft Server [Trailer - Feb.1].ogg + .ytdl-sub-multiple_songs_test-download-archive.json +{output_directory}/Project Zombie/[2011] Jesse's Minecraft Server + 01 - Jesse's Minecraft Server [Trailer - Mar.21].ogg Music Tags: - album: Singles - albumartist: Project Zombie - albumartists: Project Zombie - artist: Project Zombie - artists: Project Zombie - genre: Unset - title: Jesse's Minecraft Server [Trailer - Feb.1] - track: 3 - year: 2011 - Jesse's Minecraft Server [Trailer - Feb.27].ogg - Music Tags: - album: Singles - albumartist: Project Zombie - albumartists: Project Zombie - artist: Project Zombie - artists: Project Zombie - genre: Unset - title: Jesse's Minecraft Server [Trailer - Feb.27] - track: 2 - year: 2011 - Jesse's Minecraft Server [Trailer - Mar.21].ogg - Music Tags: - album: Singles + album: Jesse's Minecraft Server albumartist: Project Zombie albumartists: Project Zombie artist: Project Zombie @@ -33,4 +13,30 @@ Files created: genre: Unset title: Jesse's Minecraft Server [Trailer - Mar.21] track: 1 - year: 2011 \ No newline at end of file + tracktotal: 3 + year: 2011 + 02 - Jesse's Minecraft Server [Trailer - Feb.27].ogg + Music Tags: + album: Jesse's Minecraft Server + albumartist: Project Zombie + albumartists: Project Zombie + artist: Project Zombie + artists: Project Zombie + genre: Unset + title: Jesse's Minecraft Server [Trailer - Feb.27] + track: 2 + tracktotal: 3 + year: 2011 + 03 - Jesse's Minecraft Server [Trailer - Feb.1].ogg + Music Tags: + album: Jesse's Minecraft Server + albumartist: Project Zombie + albumartists: Project Zombie + artist: Project Zombie + artists: Project Zombie + genre: Unset + title: Jesse's Minecraft Server [Trailer - Feb.1] + track: 3 + tracktotal: 3 + year: 2011 + folder.jpg \ No newline at end of file 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 dd20375c..153bcaf3 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 @@ -1,9 +1,11 @@ Files created: ---------------------------------------- -{output_directory}/YouTube/[2019] Singles +{output_directory} + .ytdl-sub-single_song_test-download-archive.json +{output_directory}/YouTube/[2019] YouTube Rewind 2019: For the Record | #YouTubeRewind 01 - YouTube Rewind 2019: For the Record | #YouTubeRewind.mp3 Embedded Thumbnail, Music Tags: - album: Singles + album: YouTube Rewind 2019: For the Record | #YouTubeRewind albumartist: YouTube albumartists: YouTube artist: YouTube