From 6515a619d986083e74d1d65a03b607b4e274b8c1 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Mon, 23 Oct 2023 23:10:36 -0700 Subject: [PATCH] e2e good --- tests/conftest.py | 4 +- .../bandcamp/test_artist_url.json | 2 +- .../test_soundcloud_discography.json | 34 +++--- .../bandcamp/test_artist_url.txt | 2 +- .../test_soundcloud_discography.txt | 112 +++++++++--------- 5 files changed, 78 insertions(+), 76 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 5f310d64..c35f3bb7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -186,4 +186,6 @@ def tv_show_subscriptions_path() -> Path: @pytest.fixture() def music_audio_config(working_directory) -> ConfigFile: - return ConfigFile.default() + return ConfigFile.from_dict( + {"configuration": {"working_directory": working_directory}} + ) 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 29f3ad5f..0df27606 100644 --- a/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json +++ b/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json @@ -1,5 +1,5 @@ { - ".Sithu Aye-download-archive.json": "0c58919b660f699f6aea2ec523c812c5", + ".ytdl-sub-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", 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 d294e12d..3984497b 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 @@ { - ".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" + ".ytdl-sub-j_b-download-archive.json": "1a99156e9ece62539fb2608416a07200", + "j_b/[2021] Baby Santana's Dorian Groove/01 - Baby Santana's Dorian Groove.mp3": "6325a6b14684f9df2d482ce27ff4d455", + "j_b/[2021] Baby Santana's Dorian Groove/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", + "j_b/[2021] Purple Clouds/01 - Purple Clouds.mp3": "d7ece3072374c7cf88f44ba03a27bd26", + "j_b/[2021] Purple Clouds/folder.jpg": "967892be44b8c47e1be73f055a7c6f08", + "j_b/[2022] Acoustic Treats/01 - 20160426 184214.mp3": "2a0232454e2ef2a12e74496d3389f1ca", + "j_b/[2022] Acoustic Treats/02 - 20160502 123150.mp3": "cd4276f72de542b03d6e193352565603", + "j_b/[2022] Acoustic Treats/03 - 20160504 143832.mp3": "80d9152600faca9d0dc8dee41a028cf8", + "j_b/[2022] Acoustic Treats/04 - 20160601 221234.mp3": "2ee3c7f489ffc961e6ebc8d2ab4af000", + "j_b/[2022] Acoustic Treats/05 - 20160601 222440.mp3": "0aeb9c6165ecdaa993de4d7958ae9b5f", + "j_b/[2022] Acoustic Treats/06 - 20170604 190236.mp3": "eeb122552f13533a647828435dcac99e", + "j_b/[2022] Acoustic Treats/07 - 20170612 193646.mp3": "1c387d318152e3783c06fbe040c4abf0", + "j_b/[2022] Acoustic Treats/08 - 20170628 215206.mp3": "97a5689681217fb6da82f21953f63ffb", + "j_b/[2022] Acoustic Treats/09 - Finding Home.mp3": "5440e42341549d2ade910ef44baf44d4", + "j_b/[2022] Acoustic Treats/10 - Shallow Water WIP.mp3": "4029bdf1d78995aa6a961fd2ea671f41", + "j_b/[2022] Acoustic Treats/11 - Untold History.mp3": "3687b16d0cefde103f80b76ba8490632", + "j_b/[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 ecad313f..54b6fae0 100644 --- a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt +++ b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt @@ -1,7 +1,7 @@ Files created: ---------------------------------------- {output_directory} - .Sithu Aye-download-archive.json + .ytdl-sub-Sithu Aye-download-archive.json {output_directory}/Sithu Aye/[2021] 10 Years： Remixes and Reimaginings 01 - Double Helix Reimagined.mp3 Music Tags: 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 39ea9ca6..246601a9 100644 --- a/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt +++ b/tests/resources/transaction_log_summaries/soundcloud/test_soundcloud_discography.txt @@ -1,43 +1,43 @@ Files created: ---------------------------------------- {output_directory} - .j_b-download-archive.json -{output_directory}/jessebannon/[2021] Baby Santana's Dorian Groove + .ytdl-sub-j_b-download-archive.json +{output_directory}/j_b/[2021] Baby Santana's Dorian Groove 01 - Baby Santana's Dorian Groove.mp3 Music Tags: album: Baby Santana's Dorian Groove - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: Baby Santana's Dorian Groove track: 1 tracktotal: 1 year: 2021 folder.jpg -{output_directory}/jessebannon/[2021] Purple Clouds +{output_directory}/j_b/[2021] Purple Clouds 01 - Purple Clouds.mp3 Music Tags: album: Purple Clouds - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: Purple Clouds track: 1 tracktotal: 1 year: 2021 folder.jpg -{output_directory}/jessebannon/[2022] Acoustic Treats +{output_directory}/j_b/[2022] Acoustic Treats 01 - 20160426 184214.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20160426 184214 track: 1 @@ -46,10 +46,10 @@ Files created: 02 - 20160502 123150.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20160502 123150 track: 2 @@ -58,10 +58,10 @@ Files created: 03 - 20160504 143832.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20160504 143832 track: 3 @@ -70,10 +70,10 @@ Files created: 04 - 20160601 221234.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20160601 221234 track: 4 @@ -82,10 +82,10 @@ Files created: 05 - 20160601 222440.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20160601 222440 track: 5 @@ -94,10 +94,10 @@ Files created: 06 - 20170604 190236.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20170604 190236 track: 6 @@ -106,10 +106,10 @@ Files created: 07 - 20170612 193646.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20170612 193646 track: 7 @@ -118,10 +118,10 @@ Files created: 08 - 20170628 215206.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: 20170628 215206 track: 8 @@ -130,10 +130,10 @@ Files created: 09 - Finding Home.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: Finding Home track: 9 @@ -142,10 +142,10 @@ Files created: 10 - Shallow Water WIP.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: Shallow Water WIP track: 10 @@ -154,10 +154,10 @@ Files created: 11 - Untold History.mp3 Music Tags: album: Acoustic Treats - albumartist: jessebannon - albumartists: jessebannon - artist: jessebannon - artists: jessebannon + albumartist: j_b + albumartists: j_b + artist: j_b + artists: j_b genre: Acoustic title: Untold History track: 11