diff --git a/tests/resources/expected_downloads_summaries/unit/music/Bandcamp.json b/tests/resources/expected_downloads_summaries/unit/music/Bandcamp.json index abfc1b26..d051d7d5 100644 --- a/tests/resources/expected_downloads_summaries/unit/music/Bandcamp.json +++ b/tests/resources/expected_downloads_summaries/unit/music/Bandcamp.json @@ -1,11 +1,9 @@ { - ".ytdl-sub-subscription_test-download-archive.json": "3d12578ca04adf67117b8aa2b32634f9", - "subscription_test/[2020] Mock Entry 20-1/02 - Mock Entry 20-1.mp3": "ba28f3597c223ca59c781c862de65ecc", - "subscription_test/[2020] Mock Entry 20-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-2/03 - Mock Entry 20-2.mp3": "dbfc73ad4fab626793f8430ba60dfe32", - "subscription_test/[2020] Mock Entry 20-2/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-3/04 - Mock Entry 20-3.mp3": "2efa8690b7462c1ed075a7804df36247", - "subscription_test/[2020] Mock Entry 20-3/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2021] Mock Entry 21-1/01 - Mock Entry 21-1.mp3": "d27a7a267742f5d7a155995484795f9c", - "subscription_test/[2021] Mock Entry 21-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" + ".ytdl-sub-subscription_test-download-archive.json": "36b3c7143ac4257489791309d802af82", + "subscription_test/[2020] Download First/02 - Mock Entry 20-1.mp3": "7b0ff394bc1fbb8419735914692cb2e4", + "subscription_test/[2020] Download First/03 - Mock Entry 20-2.mp3": "e3b5de70c625eb55d0eb7cacf0429fa5", + "subscription_test/[2020] Download First/04 - Mock Entry 20-3.mp3": "31fd8d0d38139aafb74ec94ba34a53dc", + "subscription_test/[2020] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", + "subscription_test/[2021] Download First/01 - Mock Entry 21-1.mp3": "3459b2735afa7e41a32c34198e780a5e", + "subscription_test/[2021] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/unit/music/SoundCloud Discography.json b/tests/resources/expected_downloads_summaries/unit/music/SoundCloud Discography.json index d9ed9545..73dc4dd1 100644 --- a/tests/resources/expected_downloads_summaries/unit/music/SoundCloud Discography.json +++ b/tests/resources/expected_downloads_summaries/unit/music/SoundCloud Discography.json @@ -1,11 +1,9 @@ { - ".ytdl-sub-subscription_test-download-archive.json": "e2bac02784de402eeed809b4766dafc4", - "subscription_test/[2020] Mock Entry 20-1/02 - Mock Entry 20-1.mp3": "ba28f3597c223ca59c781c862de65ecc", - "subscription_test/[2020] Mock Entry 20-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-2/03 - Mock Entry 20-2.mp3": "dbfc73ad4fab626793f8430ba60dfe32", - "subscription_test/[2020] Mock Entry 20-2/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-3/04 - Mock Entry 20-3.mp3": "2efa8690b7462c1ed075a7804df36247", - "subscription_test/[2020] Mock Entry 20-3/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", + ".ytdl-sub-subscription_test-download-archive.json": "71c01e840f508dad1f7cf2b533bdb9d3", + "subscription_test/[2020] Download First/02 - Mock Entry 20-1.mp3": "7b0ff394bc1fbb8419735914692cb2e4", + "subscription_test/[2020] Download First/03 - Mock Entry 20-2.mp3": "e3b5de70c625eb55d0eb7cacf0429fa5", + "subscription_test/[2020] Download First/04 - Mock Entry 20-3.mp3": "31fd8d0d38139aafb74ec94ba34a53dc", + "subscription_test/[2020] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", "subscription_test/[2020] Mock Entry 20-4/01 - Mock Entry 20-4.mp3": "5ceaa156a59d7f80dd74d9ce80cf8e5c", "subscription_test/[2020] Mock Entry 20-4/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", "subscription_test/[2020] Mock Entry 20-5/01 - Mock Entry 20-5.mp3": "e651c65df918ab082d7051cd9b743972", @@ -14,6 +12,6 @@ "subscription_test/[2020] Mock Entry 20-6/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", "subscription_test/[2020] Mock Entry 20-7/01 - Mock Entry 20-7.mp3": "974fe1dc4a18a67f4b0e8c7c123397e3", "subscription_test/[2020] Mock Entry 20-7/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2021] Mock Entry 21-1/01 - Mock Entry 21-1.mp3": "d27a7a267742f5d7a155995484795f9c", - "subscription_test/[2021] Mock Entry 21-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" + "subscription_test/[2021] Download First/01 - Mock Entry 21-1.mp3": "3459b2735afa7e41a32c34198e780a5e", + "subscription_test/[2021] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/unit/music/YouTube Releases.json b/tests/resources/expected_downloads_summaries/unit/music/YouTube Releases.json index abfc1b26..d051d7d5 100644 --- a/tests/resources/expected_downloads_summaries/unit/music/YouTube Releases.json +++ b/tests/resources/expected_downloads_summaries/unit/music/YouTube Releases.json @@ -1,11 +1,9 @@ { - ".ytdl-sub-subscription_test-download-archive.json": "3d12578ca04adf67117b8aa2b32634f9", - "subscription_test/[2020] Mock Entry 20-1/02 - Mock Entry 20-1.mp3": "ba28f3597c223ca59c781c862de65ecc", - "subscription_test/[2020] Mock Entry 20-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-2/03 - Mock Entry 20-2.mp3": "dbfc73ad4fab626793f8430ba60dfe32", - "subscription_test/[2020] Mock Entry 20-2/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2020] Mock Entry 20-3/04 - Mock Entry 20-3.mp3": "2efa8690b7462c1ed075a7804df36247", - "subscription_test/[2020] Mock Entry 20-3/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", - "subscription_test/[2021] Mock Entry 21-1/01 - Mock Entry 21-1.mp3": "d27a7a267742f5d7a155995484795f9c", - "subscription_test/[2021] Mock Entry 21-1/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" + ".ytdl-sub-subscription_test-download-archive.json": "36b3c7143ac4257489791309d802af82", + "subscription_test/[2020] Download First/02 - Mock Entry 20-1.mp3": "7b0ff394bc1fbb8419735914692cb2e4", + "subscription_test/[2020] Download First/03 - Mock Entry 20-2.mp3": "e3b5de70c625eb55d0eb7cacf0429fa5", + "subscription_test/[2020] Download First/04 - Mock Entry 20-3.mp3": "31fd8d0d38139aafb74ec94ba34a53dc", + "subscription_test/[2020] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7", + "subscription_test/[2021] Download First/01 - Mock Entry 21-1.mp3": "3459b2735afa7e41a32c34198e780a5e", + "subscription_test/[2021] Download First/folder.jpg": "e80c508c4818454300133fe1dc1a9cd7" } \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt b/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt index 20c90327..5ae093e3 100644 --- a/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt +++ b/tests/resources/transaction_log_summaries/unit/music/Bandcamp.txt @@ -2,10 +2,10 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-subscription_test-download-archive.json -{output_directory}/subscription_test/[2020] Mock Entry 20-1 +{output_directory}/subscription_test/[2020] Download First 02 - Mock Entry 20-1.mp3 Music Tags: - album: Mock Entry 20-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -15,11 +15,9 @@ Files created: track: 2 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-2 03 - Mock Entry 20-2.mp3 Music Tags: - album: Mock Entry 20-2 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -29,11 +27,9 @@ Files created: track: 3 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-3 04 - Mock Entry 20-3.mp3 Music Tags: - album: Mock Entry 20-3 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -44,10 +40,10 @@ Files created: tracktotal: 4 year: 2020 folder.jpg -{output_directory}/subscription_test/[2021] Mock Entry 21-1 +{output_directory}/subscription_test/[2021] Download First 01 - Mock Entry 21-1.mp3 Music Tags: - album: Mock Entry 21-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test 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 4aeb68c3..fdee3723 100644 --- a/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt +++ b/tests/resources/transaction_log_summaries/unit/music/SoundCloud Discography.txt @@ -2,10 +2,10 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-subscription_test-download-archive.json -{output_directory}/subscription_test/[2020] Mock Entry 20-1 +{output_directory}/subscription_test/[2020] Download First 02 - Mock Entry 20-1.mp3 Music Tags: - album: Mock Entry 20-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -15,11 +15,9 @@ Files created: track: 2 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-2 03 - Mock Entry 20-2.mp3 Music Tags: - album: Mock Entry 20-2 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -29,11 +27,9 @@ Files created: track: 3 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-3 04 - Mock Entry 20-3.mp3 Music Tags: - album: Mock Entry 20-3 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -100,10 +96,10 @@ Files created: tracktotal: 1 year: 2020 folder.jpg -{output_directory}/subscription_test/[2021] Mock Entry 21-1 +{output_directory}/subscription_test/[2021] Download First 01 - Mock Entry 21-1.mp3 Music Tags: - album: Mock Entry 21-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test 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 20c90327..5ae093e3 100644 --- a/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt +++ b/tests/resources/transaction_log_summaries/unit/music/YouTube Releases.txt @@ -2,10 +2,10 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-subscription_test-download-archive.json -{output_directory}/subscription_test/[2020] Mock Entry 20-1 +{output_directory}/subscription_test/[2020] Download First 02 - Mock Entry 20-1.mp3 Music Tags: - album: Mock Entry 20-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -15,11 +15,9 @@ Files created: track: 2 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-2 03 - Mock Entry 20-2.mp3 Music Tags: - album: Mock Entry 20-2 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -29,11 +27,9 @@ Files created: track: 3 tracktotal: 4 year: 2020 - folder.jpg -{output_directory}/subscription_test/[2020] Mock Entry 20-3 04 - Mock Entry 20-3.mp3 Music Tags: - album: Mock Entry 20-3 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test @@ -44,10 +40,10 @@ Files created: tracktotal: 4 year: 2020 folder.jpg -{output_directory}/subscription_test/[2021] Mock Entry 21-1 +{output_directory}/subscription_test/[2021] Download First 01 - Mock Entry 21-1.mp3 Music Tags: - album: Mock Entry 21-1 + album: Download First albumartist: subscription_test albumartists: subscription_test artist: subscription_test diff --git a/tests/unit/prebuilt_presets/conftest.py b/tests/unit/prebuilt_presets/conftest.py index 0830bb0f..5e008fe2 100644 --- a/tests/unit/prebuilt_presets/conftest.py +++ b/tests/unit/prebuilt_presets/conftest.py @@ -12,7 +12,7 @@ from resources import copy_file_fixture from ytdl_sub.config.config_file import ConfigFile from ytdl_sub.downloaders.url.downloader import MultiUrlDownloader from ytdl_sub.downloaders.ytdlp import YTDLP -from ytdl_sub.entries.variables.kwargs import DESCRIPTION +from ytdl_sub.entries.variables.kwargs import DESCRIPTION, PLAYLIST_TITLE from ytdl_sub.entries.variables.kwargs import EPOCH from ytdl_sub.entries.variables.kwargs import EXT from ytdl_sub.entries.variables.kwargs import EXTRACTOR @@ -53,6 +53,7 @@ def mock_entry_dict_factory(mock_downloaded_file_path) -> Callable: def _mock_entry_dict_factory( uid: int, upload_date: str, + playlist_title: str = "playlist title", playlist_index: int = 1, playlist_count: int = 1, is_youtube_channel: bool = False, @@ -62,6 +63,7 @@ def mock_entry_dict_factory(mock_downloaded_file_path) -> Callable: entry_dict = { UID: uid, EPOCH: 1596878400, + PLAYLIST_TITLE: playlist_title, PLAYLIST_INDEX: playlist_index, PLAYLIST_COUNT: playlist_count, EXTRACTOR: "mock-entry-dict", @@ -148,6 +150,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="21-1", upload_date="20210808", + playlist_title="Download First", playlist_index=1, playlist_count=4, is_youtube_channel=is_youtube_channel, @@ -156,6 +159,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-1", upload_date="20200808", + playlist_title="Download First", playlist_index=2, playlist_count=4, is_youtube_channel=is_youtube_channel, @@ -164,6 +168,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-2", upload_date="20200808", + playlist_title="Download First", playlist_index=3, playlist_count=4, is_youtube_channel=is_youtube_channel, @@ -172,6 +177,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-3", upload_date="20200807", + playlist_title="Download First", playlist_index=4, playlist_count=4, is_youtube_channel=is_youtube_channel, @@ -183,6 +189,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-3", upload_date="20200807", + playlist_title="Download Second", playlist_index=1, playlist_count=5, is_youtube_channel=is_youtube_channel, @@ -192,6 +199,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-4", upload_date="20200806", + playlist_title="Download Second", playlist_index=2, playlist_count=5, is_youtube_channel=is_youtube_channel, @@ -200,6 +208,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-5", upload_date="20200706", + playlist_title="Download Second", playlist_index=3, playlist_count=5, is_youtube_channel=is_youtube_channel, @@ -208,6 +217,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-6", upload_date="20200706", + playlist_title="Download Second", playlist_index=4, playlist_count=5, is_youtube_channel=is_youtube_channel, @@ -216,6 +226,7 @@ def mock_download_collection_entries( mock_entry_dict_factory( uid="20-7", upload_date="20200606", + playlist_title="Download Second", playlist_index=5, playlist_count=5, is_youtube_channel=is_youtube_channel,