From c7b21dde1fa0015fe970b9583ae078ee70c47d6f Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Tue, 8 Nov 2022 21:32:46 -0800 Subject: [PATCH] playlist fixed, fixtures look good --- examples/music_audio_from_videos.yaml | 1 - examples/music_videos_config.yaml | 6 +++--- .../plugins/test_audio_extract_playlist.json | 3 --- .../plugins/test_audio_extract_single.json | 1 - .../expected_downloads_summaries/youtube/test_playlist.json | 6 +++--- .../plugins/test_audio_extract_playlist.txt | 3 --- .../plugins/test_audio_extract_single.txt | 1 - 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/examples/music_audio_from_videos.yaml b/examples/music_audio_from_videos.yaml index 921aec21..02f6f615 100644 --- a/examples/music_audio_from_videos.yaml +++ b/examples/music_audio_from_videos.yaml @@ -11,7 +11,6 @@ presets: output_options: output_directory: "{music_directory}" file_name: "{custom_track_name_sanitized}.{ext}" - info_json_name: "{custom_track_name_sanitized}.{info_json_ext}" audio_extract: codec: "mp3" diff --git a/examples/music_videos_config.yaml b/examples/music_videos_config.yaml index 477d286a..15408f01 100644 --- a/examples/music_videos_config.yaml +++ b/examples/music_videos_config.yaml @@ -29,9 +29,9 @@ presets: # To download age-restricted videos, you will need to set your cookie # file here as a ytdl parameter. For more info, see # https://ytdl-sub.readthedocs.io/en/latest/faq.html#download-age-restricted-youtube-videos - # - # ytdl_options: - # cookiefile: "path/to/cookie_file.txt + ytdl_options: + # cookiefile: "path/to/cookie_file.txt + break_on_existing: True # Stop downloads if it already exists # For each video downloaded, set the file and thumbnail name here. # We set both with {music_video_name}, which is a variable we define in diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json index ebbdb5c4..22b7eebd 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_playlist.json @@ -1,8 +1,5 @@ { - "Jesse's Minecraft Server [Trailer - Feb.1].info.json": "ba897b0df53c440203f34d7c4fb1ed85", "Jesse's Minecraft Server [Trailer - Feb.1].ogg": "afb2264e271e3c464d0fe9ba0db37f88", - "Jesse's Minecraft Server [Trailer - Feb.27].info.json": "800a9d5918fb4cec8a889ac2f0c93c70", "Jesse's Minecraft Server [Trailer - Feb.27].ogg": "6f322d842a1e43b4c9981b42423d9b4c", - "Jesse's Minecraft Server [Trailer - Mar.21].info.json": "39da60adb842c4466a676c8e34e92749", "Jesse's Minecraft Server [Trailer - Mar.21].ogg": "fe1dc3361a102661c27020d5b95a2a81" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json index fd3a0d81..81329080 100644 --- a/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json +++ b/tests/resources/expected_downloads_summaries/plugins/test_audio_extract_single.json @@ -1,4 +1,3 @@ { - "YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.info.json": "538d2461930a75595198578079654aa2", "YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3": "d3687bf6c13a2a5f3a8a05fbce9be28c" } \ No newline at end of file diff --git a/tests/resources/expected_downloads_summaries/youtube/test_playlist.json b/tests/resources/expected_downloads_summaries/youtube/test_playlist.json index bb09c2c8..3f4808cf 100644 --- a/tests/resources/expected_downloads_summaries/youtube/test_playlist.json +++ b/tests/resources/expected_downloads_summaries/youtube/test_playlist.json @@ -1,15 +1,15 @@ { ".ytdl-sub-music_video_playlist_test-download-archive.json": "e7f7c35e33c132a96d1f12b18f388b35", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.1]-thumb.jpg": "b232d253df621aa770b780c1301d364d", - "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "7afc65d649a435bbdadc3a69e0498033", + "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "ee2492edc6af9141d00db2390d5f2b73", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.1].mp4": "7bfa1475504a7c8a4aaa8c89f9306331", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.1].nfo": "de6f9a17a5ebf92aa02b14f7342b8d36", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.27]-thumb.jpg": "d17c379ea8b362f5b97c6b213b0342cb", - "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "b4c1b4ea4fc57029a9e4075773966069", + "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "6536d806edf8a8ee0613f5e4751eb045", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.27].mp4": "04ab5cb3cc12325d0c96a7cd04a8b91d", "JMC/JMC - Jesse's Minecraft Server [Trailer - Feb.27].nfo": "9a4a57bb91f1ac97b588fdf66bac4c9b", "JMC/JMC - Jesse's Minecraft Server [Trailer - Mar.21]-thumb.jpg": "e7830aa8a64b0cde65ba3f7e5fc56530", - "JMC/JMC - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "feef5d1953211af25f567b7798fca34b", + "JMC/JMC - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "5c72202155405e4b4f08c98ea7dbb34a", "JMC/JMC - Jesse's Minecraft Server [Trailer - Mar.21].mp4": "025de6099a5c98e6397153c7a62d517d", "JMC/JMC - Jesse's Minecraft Server [Trailer - Mar.21].nfo": "b98f1fa3e76b4592aeeaed4f6e220809", "poster.jpg": "e7830aa8a64b0cde65ba3f7e5fc56530", diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt index 0a86aab0..8349bc6f 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_playlist.txt @@ -1,7 +1,6 @@ Files created: ---------------------------------------- {output_directory} - Jesse's Minecraft Server [Trailer - Feb.1].info.json Jesse's Minecraft Server [Trailer - Feb.1].ogg Music Tags: album: Singles @@ -11,7 +10,6 @@ Files created: title: Jesse's Minecraft Server [Trailer - Feb.1] track: 3 year: 2011 - Jesse's Minecraft Server [Trailer - Feb.27].info.json Jesse's Minecraft Server [Trailer - Feb.27].ogg Music Tags: album: Singles @@ -21,7 +19,6 @@ Files created: title: Jesse's Minecraft Server [Trailer - Feb.27] track: 2 year: 2011 - Jesse's Minecraft Server [Trailer - Mar.21].info.json Jesse's Minecraft Server [Trailer - Mar.21].ogg Music Tags: album: Singles diff --git a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt index f99947d2..cf9114ee 100644 --- a/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt +++ b/tests/resources/transaction_log_summaries/plugins/test_audio_extract_single.txt @@ -1,7 +1,6 @@ Files created: ---------------------------------------- {output_directory} - YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.info.json YouTube Rewind 2019： For the Record ｜ #YouTubeRewind.mp3 Music Tags: album: Singles