diff --git a/.gitignore b/.gitignore index d467a238..20d1b188 100644 --- a/.gitignore +++ b/.gitignore @@ -145,5 +145,7 @@ docker/testing/volumes .local/ +.ytdl-sub-working-directory + ffmpeg.exe -ffprobe.exe \ No newline at end of file +ffprobe.exe diff --git a/tests/e2e/bandcamp/test_bandcamp.py b/tests/e2e/bandcamp/test_bandcamp.py index 2b1fb3f0..6bf5eec4 100644 --- a/tests/e2e/bandcamp/test_bandcamp.py +++ b/tests/e2e/bandcamp/test_bandcamp.py @@ -6,31 +6,17 @@ from expected_transaction_log import assert_transaction_log_matches from ytdl_sub.downloaders.ytdlp import YTDLP from ytdl_sub.subscriptions.subscription import Subscription - @pytest.fixture def subscription_dict(output_directory): return { - "preset": "albums_from_playlists", - "regex": { - "skip_if_match_fails": False, # Error if regex match fails - "from": { - "title": { - "match": ["^(.*) - (.*)"], # Captures 'title' from 'Emily Hopkins - title' - "capture_group_names": [ - "captured_track_artist", - "captured_track_title", - ], - } - }, - }, + "preset": "Bandcamp", "ytdl_options": { "max_downloads": 15, }, - "date_range": {"before": "20230101"}, + "date_range": {"after": "20210110"}, "overrides": { - "url": "https://funkypselicave.bandcamp.com/", - "track_title": "{captured_track_title}", - "track_artist": "{captured_track_artist}", + "subscription_value": "https://sithuayemusic.bandcamp.com/", + "subscription_indent_1": "Progressive Metal", "music_directory": output_directory, }, } @@ -38,7 +24,7 @@ def subscription_dict(output_directory): class TestBandcamp: @pytest.mark.parametrize("dry_run", [True, False]) - def test_download_artist_url( + def test_prebuilt_preset_download( self, subscription_dict, music_audio_config, @@ -47,7 +33,7 @@ class TestBandcamp: ): discography_subscription = Subscription.from_dict( preset_dict=subscription_dict, - preset_name="jb", + preset_name="Sithu Aye", config=music_audio_config, ) transaction_log = discography_subscription.download(dry_run=dry_run) diff --git a/tests/e2e/soundcloud/test_soundcloud_discography.py b/tests/e2e/soundcloud/test_soundcloud_discography.py index 6788118d..fa4ad49c 100644 --- a/tests/e2e/soundcloud/test_soundcloud_discography.py +++ b/tests/e2e/soundcloud/test_soundcloud_discography.py @@ -8,11 +8,10 @@ from ytdl_sub.subscriptions.subscription import Subscription @pytest.fixture def subscription_dict(output_directory): return { - "preset": "soundcloud_discography", - "format": "worst[ext=mp3]", # download the worst format so it is fast + "preset": "SoundCloud Discography", "overrides": { - "track_artist": "j_b", - "sc_artist_url": "https://soundcloud.com/jessebannon", + "subscription_value": "https://soundcloud.com/jessebannon", + "subscription_indent_1": "Acoustic", "music_directory": output_directory, }, } @@ -34,7 +33,7 @@ class TestSoundcloudDiscography: ): discography_subscription = Subscription.from_dict( preset_dict=subscription_dict, - preset_name="jb", + preset_name="j_b", config=music_audio_config, ) transaction_log = discography_subscription.download(dry_run=dry_run) diff --git a/tests/resources.py b/tests/resources.py index 911b330a..de1c5ab2 100644 --- a/tests/resources.py +++ b/tests/resources.py @@ -1,7 +1,7 @@ import shutil from pathlib import Path -REGENERATE_FIXTURES: bool = False +REGENERATE_FIXTURES: bool = True RESOURCE_PATH: Path = Path("tests") / "resources" _FILE_FIXTURE_PATH: Path = RESOURCE_PATH / "file_fixtures" diff --git a/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json b/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json index 13425b10..29f3ad5f 100644 --- a/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json +++ b/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json @@ -1,19 +1,20 @@ { - ".ytdl-sub-jb-download-archive.json": "9f5ca17dc0d842ac4c296054c0011ace", - "El Jazzy Chavo/[2022] S950 Funk/01 - Spark it.mp3": "f1fcc87884ced84be016391e3989b5c1", - "El Jazzy Chavo/[2022] S950 Funk/02 - Astronomikal Funk.mp3": "d07701404b8ddaa2e38eb51f7e2ac2d8", - "El Jazzy Chavo/[2022] S950 Funk/03 - Impulse.mp3": "43118db203e1d9427036102cfb39a1e3", - "El Jazzy Chavo/[2022] S950 Funk/04 - September.mp3": "3d75c5068e3dbb93dd86fc650c7ca84d", - "El Jazzy Chavo/[2022] S950 Funk/05 - Interlune.mp3": "63897d8af920f31af2183a17bc697c11", - "El Jazzy Chavo/[2022] S950 Funk/06 - Ninjutsu Techniques.mp3": "a500409583ee30e4cb68d64af2b32596", - "El Jazzy Chavo/[2022] S950 Funk/07 - Space Funk Flow.mp3": "1e1a12a5a42a607abf342ec4f301f471", - "El Jazzy Chavo/[2022] S950 Funk/08 - Cellar Groove.mp3": "a18ceff8785e8849d166eb2710caafa4", - "El Jazzy Chavo/[2022] S950 Funk/09 - Solar Wind.mp3": "a41665337e3fe05d7c7d9d8e6ddde737", - "El Jazzy Chavo/[2022] S950 Funk/10 - Interlune II.mp3": "8d2f3158ac9bac51aafbdbe6eb43154b", - "El Jazzy Chavo/[2022] S950 Funk/11 - Ghetto Anthem.mp3": "39085bae1b0f8544acd08f74f88cacfd", - "El Jazzy Chavo/[2022] S950 Funk/12 - Street Degree.mp3": "561f0d8fbc62f87f2149c17ee0a53ce2", - "El Jazzy Chavo/[2022] S950 Funk/13 - Trouble World.mp3": "1ad07dc6a2d6ced78449bc46a2909335", - "El Jazzy Chavo/[2022] S950 Funk/14 - Relaxation.mp3": "ba8addb0d59f26a84bbb79a6cdd1af11", - "El Jazzy Chavo/[2022] S950 Funk/15 - Journey From Within.mp3": "bd97135290482c6bbe6eac7d3a700f11", - "El Jazzy Chavo/[2022] S950 Funk/folder.jpg": "62e51365dd309e76a6323f927f6fcc94" + ".Sithu Aye-download-archive.json": "0c58919b660f699f6aea2ec523c812c5", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/01 - Double Helix Reimagined.mp3": "a627cfc0964be6a7e668fd8289326140", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/02 - Skye Reimagined.mp3": "94127e3d82f5d33d920b82f90d4f9657", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/03 - Baryofusion.mp3": "dcf4b30e3fdeb29154b3888838986c1e", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/04 - Mandalay Reimagined.mp3": "8304b012a8a8306c80e3f7f7cb0f35e7", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/05 - Messenger EDM Remix.mp3": "0a7e4c613a055e571142182717fc684e", + "Sithu Aye/[2021] 10 Years： Remixes and Reimaginings/folder.jpg": "bf6f70d51557a71b69fed85b2cb476f0", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/01 - Invent the Universe.mp3": "d723a2e1f2ec75b3d20f1a0de616a191", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/02 - Grand Unification (feat. David Maxim Micic).mp3": "0e550ebe93f8b5349eb07c7554ad22d9", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/03 - Expansion.mp3": "6324f012f09a2e7028ca923fdff3a89a", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/04 - Baryogenesis.mp3": "d30de9d811f56c2179fd86c6bede2fc5", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/05 - Particles Collide (feat. Plini).mp3": "f869f1948b376f2ad98381b0c77d447f", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/06 - Nucleosynthesis.mp3": "23d6ceb9865d6d6030d8659a2eed5698", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/07 - Recombination.mp3": "4ae97dc8457e48fa7aad9a64b927bf1d", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/08 - Dark Ages.mp3": "922e8a54e3e543bbf9b866e2f4a53607", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/09 - Formation.mp3": "fd7ce4553df5323355bc95e6528e1515", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/10 - Pale Blue Dot.mp3": "6328960f01a118d84fa1f1ab3565bf90", + "Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster)/folder.jpg": "d8cffeca026afaa619f641a95143f803" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/soundcloud/test_soundcloud_discography.json b/tests/resources/expected_downloads_summaries/soundcloud/test_soundcloud_discography.json index 54b5e340..d294e12d 100644 --- a/tests/resources/expected_downloads_summaries/soundcloud/test_soundcloud_discography.json +++ b/tests/resources/expected_downloads_summaries/soundcloud/test_soundcloud_discography.json @@ -1,19 +1,19 @@ { - ".ytdl-sub-jb-download-archive.json": "1a99156e9ece62539fb2608416a07200", - "j_b/[2021] Baby Santana's Dorian Groove/01 - Baby Santana's Dorian Groove.mp3": "317a9ee75431d6020e3cad0883c7392f", - "j_b/[2021] Baby Santana's Dorian Groove/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", - "j_b/[2021] Purple Clouds/01 - Purple Clouds.mp3": "4a5971c12ca6fdc335b0185a14e829f2", - "j_b/[2021] Purple Clouds/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", - "j_b/[2022] Acoustic Treats/01 - 20160426 184214.mp3": "bcc88eb579311b59ede4c13cdf24bcb9", - "j_b/[2022] Acoustic Treats/02 - 20160502 123150.mp3": "239d10c17047662c760cce834548d91d", - "j_b/[2022] Acoustic Treats/03 - 20160504 143832.mp3": "2d6e977e3e665012fdeaa0e8c2ee7375", - "j_b/[2022] Acoustic Treats/04 - 20160601 221234.mp3": "9da5b26fc231dfd0c8f09a2a3d2fe116", - "j_b/[2022] Acoustic Treats/05 - 20160601 222440.mp3": "8fb1cb262175921dbdddd6783664fa65", - "j_b/[2022] Acoustic Treats/06 - 20170604 190236.mp3": "529846e26a18be616deb3f12d858b8ea", - "j_b/[2022] Acoustic Treats/07 - 20170612 193646.mp3": "ba2be1ace7b0c31964bf0b8b15781b27", - "j_b/[2022] Acoustic Treats/08 - 20170628 215206.mp3": "ad248c0392ced4f6d548a4852fd99f1f", - "j_b/[2022] Acoustic Treats/09 - Finding Home.mp3": "52326cbd96e6f243cae77b0f68f00ef6", - "j_b/[2022] Acoustic Treats/10 - Shallow Water WIP.mp3": "a265ed7e4d3a014d09e79ac5f4fe3fc7", - "j_b/[2022] Acoustic Treats/11 - Untold History.mp3": "94d548773dded0089e73b26e6f923d9a", - "j_b/[2022] Acoustic Treats/folder.jpg": "967892be44b8c47e1be73f055a7c6f08" + ".j_b-download-archive.json": "7add371247b4a94ac07ace1602272c74", + "jessebannon/[2021] Baby Santana's Dorian Groove/01 - Baby Santana's Dorian Groove.mp3": "735cf0a8dc86ea8124f00e2d0a4444bd", + "jessebannon/[2021] Baby Santana's Dorian Groove/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", + "jessebannon/[2021] Purple Clouds/01 - Purple Clouds.mp3": "0c320731add52c048cbe05dca553ed1e", + "jessebannon/[2021] Purple Clouds/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", + "jessebannon/[2022] Acoustic Treats/01 - 20160426 184214.mp3": "419c38a44f791f0260967c25d56c4e3c", + "jessebannon/[2022] Acoustic Treats/02 - 20160502 123150.mp3": "8765368eff2178818015d181485fc240", + "jessebannon/[2022] Acoustic Treats/03 - 20160504 143832.mp3": "97b06ccd5c0e9ede991812cb2f871805", + "jessebannon/[2022] Acoustic Treats/04 - 20160601 221234.mp3": "3297e4ac5d20211e893b1e8566e88d11", + "jessebannon/[2022] Acoustic Treats/05 - 20160601 222440.mp3": "dd8f8b3e4c84ebca76963758464a6228", + "jessebannon/[2022] Acoustic Treats/06 - 20170604 190236.mp3": "b74fa76df2dfc82df4ad37336fedb4dd", + "jessebannon/[2022] Acoustic Treats/07 - 20170612 193646.mp3": "4eba7bb2a48305564586dd2d8ad8393d", + "jessebannon/[2022] Acoustic Treats/08 - 20170628 215206.mp3": "51f938e13aeeec24cd1bade37d450c7d", + "jessebannon/[2022] Acoustic Treats/09 - Finding Home.mp3": "30d3828cdc5943a6ef387dca5a38643f", + "jessebannon/[2022] Acoustic Treats/10 - Shallow Water WIP.mp3": "84b2583d289342156f3c26ca456aade0", + "jessebannon/[2022] Acoustic Treats/11 - Untold History.mp3": "3b623f7c4dc3db7b57327ad7bd8d1257", + "jessebannon/[2022] Acoustic Treats/folder.jpg": "967892be44b8c47e1be73f055a7c6f08" } \ 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 e85cfcae..ecad313f 100644 --- a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt +++ b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt @@ -1,186 +1,188 @@ Files created: ---------------------------------------- {output_directory} - .ytdl-sub-jb-download-archive.json -{output_directory}/El Jazzy Chavo/[2022] S950 Funk - 01 - Spark it.mp3 + .Sithu Aye-download-archive.json +{output_directory}/Sithu Aye/[2021] 10 Years： Remixes and Reimaginings + 01 - Double Helix Reimagined.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Spark it + album: 10 Years: Remixes and Reimaginings + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Double Helix Reimagined track: 1 - tracktotal: 15 - year: 2022 - 02 - Astronomikal Funk.mp3 + tracktotal: 10 + year: 2021 + 02 - Skye Reimagined.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Astronomikal Funk + album: 10 Years: Remixes and Reimaginings + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Skye Reimagined track: 2 - tracktotal: 15 - year: 2022 - 03 - Impulse.mp3 + tracktotal: 10 + year: 2021 + 03 - Baryofusion.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Impulse + album: 10 Years: Remixes and Reimaginings + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Baryofusion track: 3 - tracktotal: 15 - year: 2022 - 04 - September.mp3 + tracktotal: 10 + year: 2021 + 04 - Mandalay Reimagined.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: September + album: 10 Years: Remixes and Reimaginings + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Mandalay Reimagined track: 4 - tracktotal: 15 - year: 2022 - 05 - Interlune.mp3 + tracktotal: 10 + year: 2021 + 05 - Messenger EDM Remix.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Interlune + album: 10 Years: Remixes and Reimaginings + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Messenger EDM Remix track: 5 - tracktotal: 15 - year: 2022 - 06 - Ninjutsu Techniques.mp3 + tracktotal: 10 + year: 2021 + folder.jpg +{output_directory}/Sithu Aye/[2022] Re：Invent the Universe (10th Anniversary Remaster) + 01 - Invent the Universe.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Ninjutsu Techniques + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Invent the Universe + track: 1 + tracktotal: 10 + year: 2022 + 02 - Grand Unification (feat. David Maxim Micic).mp3 + Music Tags: + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Grand Unification (feat. David Maxim Micic) + track: 2 + tracktotal: 10 + year: 2022 + 03 - Expansion.mp3 + Music Tags: + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Expansion + track: 3 + tracktotal: 10 + year: 2022 + 04 - Baryogenesis.mp3 + Music Tags: + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Baryogenesis + track: 4 + tracktotal: 10 + year: 2022 + 05 - Particles Collide (feat. Plini).mp3 + Music Tags: + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Particles Collide (feat. Plini) + track: 5 + tracktotal: 10 + year: 2022 + 06 - Nucleosynthesis.mp3 + Music Tags: + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Nucleosynthesis track: 6 - tracktotal: 15 + tracktotal: 10 year: 2022 - 07 - Space Funk Flow.mp3 + 07 - Recombination.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Space Funk Flow + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Recombination track: 7 - tracktotal: 15 + tracktotal: 10 year: 2022 - 08 - Cellar Groove.mp3 + 08 - Dark Ages.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Cellar Groove + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Dark Ages track: 8 - tracktotal: 15 + tracktotal: 10 year: 2022 - 09 - Solar Wind.mp3 + 09 - Formation.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Solar Wind + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Formation track: 9 - tracktotal: 15 + tracktotal: 10 year: 2022 - 10 - Interlune II.mp3 + 10 - Pale Blue Dot.mp3 Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Interlune II + album: Re:Invent the Universe (10th Anniversary Remaster) + albumartist: Sithu Aye + albumartists: Sithu Aye + artist: Sithu Aye + artists: Sithu Aye + genre: Progressive Metal + title: Pale Blue Dot track: 10 - tracktotal: 15 - year: 2022 - 11 - Ghetto Anthem.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Ghetto Anthem - track: 11 - tracktotal: 15 - year: 2022 - 12 - Street Degree.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Street Degree - track: 12 - tracktotal: 15 - year: 2022 - 13 - Trouble World.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Trouble World - track: 13 - tracktotal: 15 - year: 2022 - 14 - Relaxation.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Relaxation - track: 14 - tracktotal: 15 - year: 2022 - 15 - Journey From Within.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Journey From Within - track: 15 - tracktotal: 15 + tracktotal: 10 year: 2022 folder.jpg \ No newline at end of file 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 86015ee3..39ea9ca6 100644 --- a/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt +++ b/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt @@ -1,44 +1,44 @@ Files created: ---------------------------------------- {output_directory} - .ytdl-sub-jb-download-archive.json -{output_directory}/j_b/[2021] Baby Santana's Dorian Groove + .j_b-download-archive.json +{output_directory}/jessebannon/[2021] Baby Santana's Dorian Groove 01 - Baby Santana's Dorian Groove.mp3 Music Tags: album: Baby Santana's Dorian Groove - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: Baby Santana's Dorian Groove track: 1 tracktotal: 1 year: 2021 folder.jpg -{output_directory}/j_b/[2021] Purple Clouds +{output_directory}/jessebannon/[2021] Purple Clouds 01 - Purple Clouds.mp3 Music Tags: album: Purple Clouds - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: Purple Clouds track: 1 tracktotal: 1 year: 2021 folder.jpg -{output_directory}/j_b/[2022] Acoustic Treats +{output_directory}/jessebannon/[2022] Acoustic Treats 01 - 20160426 184214.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20160426 184214 track: 1 tracktotal: 11 @@ -46,11 +46,11 @@ Files created: 02 - 20160502 123150.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20160502 123150 track: 2 tracktotal: 11 @@ -58,11 +58,11 @@ Files created: 03 - 20160504 143832.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20160504 143832 track: 3 tracktotal: 11 @@ -70,11 +70,11 @@ Files created: 04 - 20160601 221234.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20160601 221234 track: 4 tracktotal: 11 @@ -82,11 +82,11 @@ Files created: 05 - 20160601 222440.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20160601 222440 track: 5 tracktotal: 11 @@ -94,11 +94,11 @@ Files created: 06 - 20170604 190236.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20170604 190236 track: 6 tracktotal: 11 @@ -106,11 +106,11 @@ Files created: 07 - 20170612 193646.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20170612 193646 track: 7 tracktotal: 11 @@ -118,11 +118,11 @@ Files created: 08 - 20170628 215206.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: 20170628 215206 track: 8 tracktotal: 11 @@ -130,11 +130,11 @@ Files created: 09 - Finding Home.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: Finding Home track: 9 tracktotal: 11 @@ -142,11 +142,11 @@ Files created: 10 - Shallow Water WIP.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: Shallow Water WIP track: 10 tracktotal: 11 @@ -154,11 +154,11 @@ Files created: 11 - Untold History.mp3 Music Tags: album: Acoustic Treats - albumartist: j_b - albumartists: j_b - artist: j_b - artists: j_b - genre: Unset + albumartist: jessebannon + albumartists: jessebannon + artist: jessebannon + artists: jessebannon + genre: Acoustic title: Untold History track: 11 tracktotal: 11