diff --git a/tests/e2e/youtube/test_video.py b/tests/e2e/youtube/test_video.py index 940e54a6..e7a1f2f6 100644 --- a/tests/e2e/youtube/test_video.py +++ b/tests/e2e/youtube/test_video.py @@ -3,7 +3,6 @@ from conftest import preset_dict_to_dl_args from e2e.conftest import mock_run_from_cli from expected_download import assert_expected_downloads from expected_transaction_log import assert_transaction_log_matches -from mergedeep import mergedeep from ytdl_sub.subscriptions.subscription import Subscription @@ -22,13 +21,6 @@ def single_video_preset_dict(output_directory): "ytdl_options": { "format": "worst[ext=mp4]", }, - # test override variables added by ytdl-sub - "nfo_tags": { - "tags": { - "subscription_name": "{subscription_name}", - "subscription_name_sanitized": "{subscription_name_sanitized}", - } - }, # also test video tags "video_tags": { "tags": { @@ -56,6 +48,13 @@ def single_tv_show_video_nulled_values_preset_dict(output_directory): "format": "worst[ext=mp4]", "max_downloads": 2, }, + # test override variables added by ytdl-sub + "nfo_tags": { + "tags": { + "subscription_name": "{subscription_name}", + "subscription_name_sanitized": "{subscription_name_sanitized}", + } + }, "overrides": { "url": "https://www.youtube.com/@ProjectZombie603", "tv_show_name": "Project Zombie", diff --git a/tests/resources/expected_downloads_summaries/youtube/test_video.json b/tests/resources/expected_downloads_summaries/youtube/test_video.json index 4fa532c0..c94d3dd6 100644 --- a/tests/resources/expected_downloads_summaries/youtube/test_video.json +++ b/tests/resources/expected_downloads_summaries/youtube/test_video.json @@ -1,6 +1,6 @@ { "JMC/JMC - Oblivion Mod "Falcor" p.1-thumb.jpg": "fb95b510681676e81c321171fc23143e", - "JMC/JMC - Oblivion Mod "Falcor" p.1.info.json": "1b12a13b9db6d37b350a57c7e6f37026", + "JMC/JMC - Oblivion Mod "Falcor" p.1.info.json": "59ac500bb4778b37bd8c8fb472269e95", "JMC/JMC - Oblivion Mod "Falcor" p.1.mp4": "3744c49f2e447bd7712a5aad5ed36be2", - "JMC/JMC - Oblivion Mod "Falcor" p.1.nfo": "22e9d46ea7c243ac1f255adfd6c131ec" + "JMC/JMC - Oblivion Mod "Falcor" p.1.nfo": "24cc4e17d2bebc89b2759ce5471d403e" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/youtube/test_video_cli.json b/tests/resources/expected_downloads_summaries/youtube/test_video_cli.json index 5b180e06..83521f0e 100644 --- a/tests/resources/expected_downloads_summaries/youtube/test_video_cli.json +++ b/tests/resources/expected_downloads_summaries/youtube/test_video_cli.json @@ -1,6 +1,6 @@ { "JMC/JMC - Oblivion Mod "Falcor" p.1-thumb.jpg": "fb95b510681676e81c321171fc23143e", - "JMC/JMC - Oblivion Mod "Falcor" p.1.info.json": "57de511c9a97b1605165486875e73bc2", + "JMC/JMC - Oblivion Mod "Falcor" p.1.info.json": "2ad1e593fc1c50a53a107db062e82c4a", "JMC/JMC - Oblivion Mod "Falcor" p.1.mp4": "3744c49f2e447bd7712a5aad5ed36be2", - "JMC/JMC - Oblivion Mod "Falcor" p.1.nfo": "d5cc3019c647f77ca42eb1ad1e777f6d" + "JMC/JMC - Oblivion Mod "Falcor" p.1.nfo": "24cc4e17d2bebc89b2759ce5471d403e" } \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/youtube/test_video.txt b/tests/resources/transaction_log_summaries/youtube/test_video.txt index b49e3f12..8162ad7f 100644 --- a/tests/resources/transaction_log_summaries/youtube/test_video.txt +++ b/tests/resources/transaction_log_summaries/youtube/test_video.txt @@ -11,7 +11,5 @@ Files created: musicvideo: album: Music Videos artist: JMC - subscription_name: music_video_single_video_test - subscription_name_sanitized: music_video_single_video_test title: Oblivion Mod "Falcor" p.1 year: 2010 \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/youtube/test_video_cli.txt b/tests/resources/transaction_log_summaries/youtube/test_video_cli.txt index 27b6febf..8162ad7f 100644 --- a/tests/resources/transaction_log_summaries/youtube/test_video_cli.txt +++ b/tests/resources/transaction_log_summaries/youtube/test_video_cli.txt @@ -11,7 +11,5 @@ Files created: musicvideo: album: Music Videos artist: JMC - subscription_name: cli-dl-0302c976 - subscription_name_sanitized: cli-dl-0302c976 title: Oblivion Mod "Falcor" p.1 year: 2010 \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/youtube/test_video_nulled_values.txt b/tests/resources/transaction_log_summaries/youtube/test_video_nulled_values.txt index ff98d350..8b995cda 100644 --- a/tests/resources/transaction_log_summaries/youtube/test_video_nulled_values.txt +++ b/tests/resources/transaction_log_summaries/youtube/test_video_nulled_values.txt @@ -43,6 +43,8 @@ Files created: This is the first time I've really used the editor, and the beginning of our first mod. Hope you enjoy. season: 2010 + subscription_name: tv_video_nulled_values + subscription_name_sanitized: tv_video_nulled_values title: 2010-08-13 - Oblivion Mod "Falcor" p.1 year: 2010 s2010.e000002 - Oblivion Mod "Falcor" p.2.mp4 @@ -78,5 +80,7 @@ Files created: Please keep in mind that the mod is not complete, so you'll see some blank areas during the video. I haven't made LOD (Level of Distance) yet either, so areas far away will not appear. season: 2010 + subscription_name: tv_video_nulled_values + subscription_name_sanitized: tv_video_nulled_values title: 2010-12-02 - Oblivion Mod "Falcor" p.2 year: 2010 \ No newline at end of file