From 59ec9d26522017d27234a726569a6e26170f9613 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Thu, 10 Nov 2022 22:25:42 -0800 Subject: [PATCH] split chapters fixed --- tests/expected_download.py | 2 +- tests/expected_transaction_log.py | 2 +- .../plugins/split_by_chapters_video.json | 11 ----------- ...y_chapters_with_regex_no_chapters_video_pass.txt | 1 - .../plugins/split_by_chapters_with_regex_video.json | 13 +------------ .../plugins/split_by_chapters_video-dry-run.txt | 12 ------------ .../plugins/split_by_chapters_video.txt | 12 ------------ ...y_chapters_with_regex_no_chapters_video_pass.txt | 2 -- .../split_by_chapters_with_regex_video-dry-run.txt | 12 ------------ .../plugins/split_by_chapters_with_regex_video.txt | 12 ------------ 10 files changed, 3 insertions(+), 76 deletions(-) diff --git a/tests/expected_download.py b/tests/expected_download.py index 94170d2a..3a4ea874 100644 --- a/tests/expected_download.py +++ b/tests/expected_download.py @@ -117,7 +117,7 @@ def assert_expected_downloads( dry_run: bool, expected_download_summary_file_name: str, ignore_md5_hashes_for: Optional[List[str]] = None, - regenerate_expected_download_summary: bool = True, + regenerate_expected_download_summary: bool = False, ): if dry_run: output_directory_contents = list(Path(output_directory).rglob("*")) diff --git a/tests/expected_transaction_log.py b/tests/expected_transaction_log.py index 66ae5cd9..0f274970 100644 --- a/tests/expected_transaction_log.py +++ b/tests/expected_transaction_log.py @@ -12,7 +12,7 @@ def assert_transaction_log_matches( output_directory: str, transaction_log: FileHandlerTransactionLog, transaction_log_summary_file_name: str, - regenerate_transaction_log: bool = True, + regenerate_transaction_log: bool = False, ): """ Parameters 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 bb60a151..d1c039e2 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,4 @@ { - "01. Intro (Feat. Racheal Ofori & Barney Artist).info.json": "7ec75dc8f950a3d19f9a99a0a2390f1b", - "02. Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json": "75f0c24948352b46e262cb705c9efc74", - "03. Blaze (Feat. Kaya Thomas - Dyke).info.json": "5dcda18d2b2337eaa9a326c086b53703", - "04. What If (Interlude).info.json": "5518006fcb847b9c5f86f08e39b3f6d5", - "05. No Peace (Feat. Tom Misch).info.json": "8ed97ae7d19e5db238e3479493d6763f", - "06. Closer (Feat. Lester Duval).info.json": "827404f876a80882e3039624e763b873", - "07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json": "0c86725f7d9f4d3e1662f12f725e01b0", - "08. Dreams (Feat. Carmody).info.json": "8946fb56e23267b497aaf390b2026192", - "09. Dreaming (Interlude) (Feat. Racheal Ofori).info.json": "f6a50cead65457d4f8f0e18b3784cd3f", - "10. Hopeful (Feat. Jordan Rakei).info.json": "a4d7e6c810e387006604d0675c9bc978", - "11. Sunrise (Pillows) (Feat. Emmavie).info.json": "17d6ff5517283d516df7f9a94810c113", "Alfa Mist - Nocturne [Full Album]/01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3": "1ede8775719b99d05c89d6d0a2a74df5", "Alfa Mist - Nocturne [Full Album]/02 - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "2430b44a6c15050f7e2ee09274c26600", "Alfa Mist - Nocturne [Full Album]/03 - 03. Blaze (Feat. Kaya Thomas - Dyke).mp3": "8dbb8d15109955c4540dfe3c015157b8", 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 f361b436..f0d11530 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,4 @@ { - "Oblivion Mod ＂Falcor＂ p.1.info.json": "5f9e41e3244a294c5aa77d2c0dcb5b98", "Oblivion Mod ＂Falcor＂ p.1/01 - Oblivion Mod ＂Falcor＂ p.1.mp3": "6d570f225f6c3a14de0ba4c912995641", "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 b0ff97dc..b6f1baad 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,13 +1,4 @@ { - "Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json": "73ba3663e422720eb014aa93c267742b", - "Blaze (Feat. Kaya Thomas - Dyke).info.json": "7d8a52c96d9f4d7e76a79c98a8a20513", - "Closer (Feat. Lester Duval).info.json": "1bba5d087dd5e0ae74eebea1ce6c4e1d", - "Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json": "1e42dd0d0cefff6784321ec42bc81b1e", - "Dreaming (Interlude) (Feat. Racheal Ofori).info.json": "7e7f62206bd36c23c25ccf42356d42cb", - "Dreams (Feat. Carmody).info.json": "1d42fe2d3354cbf9e89f6996813f75ba", - "Hopeful (Feat. Jordan Rakei).info.json": "aa5a61393f31d8357ad6cfdab85703b7", - "Intro (Feat. Racheal Ofori & Barney Artist).info.json": "f85cf3be03514940e6904e189a5c64d5", - "No Peace (Feat. Tom Misch).info.json": "7a0126185283b340fca39b7272271a5b", "Nocturne/01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3": "b2e2a9834f03d1928e0c8a0602899d4d", "Nocturne/02 - Answers (Feat. Rick David & Kaya Thomas - Dyke).mp3": "8fe76edcc77c5d8db0f7b5b8577a4cf6", "Nocturne/03 - Blaze (Feat. Kaya Thomas - Dyke).mp3": "fd45453753a783ec4f26ef399a8ecece", @@ -19,7 +10,5 @@ "Nocturne/09 - Dreaming (Interlude) (Feat. Racheal Ofori).mp3": "e50182fa81d56bb9261654e1906d18af", "Nocturne/10 - Hopeful (Feat. Jordan Rakei).mp3": "d2f9958553262c4bee4f82f98f1d42c7", "Nocturne/11 - Sunrise (Pillows) (Feat. Emmavie).mp3": "767dc4f27cc0a57d5391baf7b242d3f0", - "Nocturne/folder.jpg": "bd3685acc53072e591bae2505ecb0648", - "Sunrise (Pillows) (Feat. Emmavie).info.json": "3019ab43e6b6bc045edfebe3600ea85e", - "What If (Interlude).info.json": "041332e428e90e64cd5fa46e513b2e65" + "Nocturne/folder.jpg": "bd3685acc53072e591bae2505ecb0648" } \ 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 12daf450..9f1fadaa 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 @@ -1,17 +1,5 @@ Files created: ---------------------------------------- -{output_directory} - 01. Intro (Feat. Racheal Ofori & Barney Artist).info.json - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json - 03. Blaze (Feat. Kaya Thomas - Dyke).info.json - 04. What If (Interlude).info.json - 05. No Peace (Feat. Tom Misch).info.json - 06. Closer (Feat. Lester Duval).info.json - 07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json - 08. Dreams (Feat. Carmody).info.json - 09. Dreaming (Interlude) (Feat. Racheal Ofori).info.json - 10. Hopeful (Feat. Jordan Rakei).info.json - 11. Sunrise (Pillows) (Feat. Emmavie).info.json {output_directory}/Alfa Mist - Nocturne [Full Album] 01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: 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 f647b036..3596b43f 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 @@ -1,17 +1,5 @@ Files created: ---------------------------------------- -{output_directory} - 01. Intro (Feat. Racheal Ofori & Barney Artist).info.json - 02. Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json - 03. Blaze (Feat. Kaya Thomas - Dyke).info.json - 04. What If (Interlude).info.json - 05. No Peace (Feat. Tom Misch).info.json - 06. Closer (Feat. Lester Duval).info.json - 07. Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json - 08. Dreams (Feat. Carmody).info.json - 09. Dreaming (Interlude) (Feat. Racheal Ofori).info.json - 10. Hopeful (Feat. Jordan Rakei).info.json - 11. Sunrise (Pillows) (Feat. Emmavie).info.json {output_directory}/Alfa Mist - Nocturne [Full Album] 01 - 01. Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: 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 94125a14..dc4013bc 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 @@ -1,7 +1,5 @@ Files created: ---------------------------------------- -{output_directory} - Oblivion Mod ＂Falcor＂ p.1.info.json {output_directory}/Oblivion Mod ＂Falcor＂ p.1 01 - Oblivion Mod ＂Falcor＂ p.1.mp3 Music Tags: 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 aff21e02..8d1ba2c6 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 @@ -1,17 +1,5 @@ Files created: ---------------------------------------- -{output_directory} - Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json - Blaze (Feat. Kaya Thomas - Dyke).info.json - Closer (Feat. Lester Duval).info.json - Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json - Dreaming (Interlude) (Feat. Racheal Ofori).info.json - Dreams (Feat. Carmody).info.json - Hopeful (Feat. Jordan Rakei).info.json - Intro (Feat. Racheal Ofori & Barney Artist).info.json - No Peace (Feat. Tom Misch).info.json - Sunrise (Pillows) (Feat. Emmavie).info.json - What If (Interlude).info.json {output_directory}/Nocturne 01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: 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 3a62f164..9d424a4c 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 @@ -1,17 +1,5 @@ Files created: ---------------------------------------- -{output_directory} - Answers (Feat. Rick David & Kaya Thomas - Dyke).info.json - Blaze (Feat. Kaya Thomas - Dyke).info.json - Closer (Feat. Lester Duval).info.json - Delusions： Rumination (Interlude) (Feat. Racheal Ofori).info.json - Dreaming (Interlude) (Feat. Racheal Ofori).info.json - Dreams (Feat. Carmody).info.json - Hopeful (Feat. Jordan Rakei).info.json - Intro (Feat. Racheal Ofori & Barney Artist).info.json - No Peace (Feat. Tom Misch).info.json - Sunrise (Pillows) (Feat. Emmavie).info.json - What If (Interlude).info.json {output_directory}/Nocturne 01 - Intro (Feat. Racheal Ofori & Barney Artist).mp3 From Chapter Split: