From 39212959b1aad0df2f48284afeb41041472a4c72 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Tue, 27 Sep 2022 17:03:46 -0700 Subject: [PATCH] update json --- .../youtube/test_channel_full.json | 74 ++++--------------- .../youtube/test_playlist.json | 21 +----- 2 files changed, 16 insertions(+), 79 deletions(-) diff --git a/tests/e2e/resources/expected_downloads_summaries/youtube/test_channel_full.json b/tests/e2e/resources/expected_downloads_summaries/youtube/test_channel_full.json index e1c22df2..1b96161f 100644 --- a/tests/e2e/resources/expected_downloads_summaries/youtube/test_channel_full.json +++ b/tests/e2e/resources/expected_downloads_summaries/youtube/test_channel_full.json @@ -1,100 +1,52 @@ { ".ytdl-sub-pz-download-archive.json": "70615451318cdb5e018e007c77893a39", "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1-thumb.jpg": "fb95b510681676e81c321171fc23143e", -<<<<<<< HEAD - "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1.info.json": "5d0c1e9a569e30b16f92410aabd340ee", -======= - "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1.info.json": "5a73e1a5de066b11b8c228f8881d790c", ->>>>>>> master + "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1.info.json": "8162ab83174c04a8e71e93918fe33582", "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1.mp4": "931a705864c57d21d6fedebed4af6bbc", "Season 2010/s2010.e0813 - Oblivion Mod ＂Falcor＂ p.1.nfo": "a71a34a60c67b939a38c2c342df0c436", "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2-thumb.jpg": "8b32ee9c037fa669e444a0ac181525a1", -<<<<<<< HEAD - "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.info.json": "21131c4b4708ea7f77648cf98f3ef4e3", - "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.mp4": "157ae6e2ce0b36bca1cfea943e461f80", + "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.info.json": "4c900235e4c2fa5b1a4b92c7c9dd0899", + "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.mp4": "0b11a785addfac82a6c1dbc897c0a8f9", "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.nfo": "5dd3914f929f1a06e9020ddfdf31cacf", "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1]-thumb.jpg": "b232d253df621aa770b780c1301d364d", - "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "3732cdb30f6e3b8203a632aaa77f193d", -======= - "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.info.json": "a43092fc871ab2f6697adc8f60a14dd2", - "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.mp4": "0b11a785addfac82a6c1dbc897c0a8f9", - "Season 2010/s2010.e1202 - Oblivion Mod ＂Falcor＂ p.2.nfo": "5c258f9e54854ef292ce3c58331da110", - "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1]-thumb.jpg": "b232d253df621aa770b780c1301d364d", - "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "d3d7c8b13a89b461c748f6239efb450f", ->>>>>>> master + "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "6fd237f5da53a8b286c8c73300026b33", "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1].mp4": "e66287b9832277b6a4d1554e29d9fdcc", "Season 2011/s2011.e0201 - Jesse's Minecraft Server [Trailer - Feb.1].nfo": "4eb6ba6910aa5f930625c2a955330051", "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27]-thumb.jpg": "d17c379ea8b362f5b97c6b213b0342cb", -<<<<<<< HEAD - "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "ff471ef617781b57069585ec1484f478", -======= - "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "25824e1e019ba1ac3ad37167bc476d05", ->>>>>>> master + "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "a0c41b44dcb5b131a6731d5cbdc05a42", "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27].mp4": "04ab5cb3cc12325d0c96a7cd04a8b91d", "Season 2011/s2011.e0227 - Jesse's Minecraft Server [Trailer - Feb.27].nfo": "2a4a319266f3b672f409c29983390404", "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21]-thumb.jpg": "e7830aa8a64b0cde65ba3f7e5fc56530", -<<<<<<< HEAD - "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "bdc4bc467c9409fc2ba10aba731bbbec", -======= - "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "5650cf47773fa4f8236e6fe62957759b", ->>>>>>> master + "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "d4fad833885df7a2e7cca00b159c034f", "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21].mp4": "025de6099a5c98e6397153c7a62d517d", "Season 2011/s2011.e0321 - Jesse's Minecraft Server [Trailer - Mar.21].nfo": "cb65c7a45d81444e7bfc5d2e64f4423d", "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net)-thumb.jpg": "c956192a379b3661595c9920972d4819", -<<<<<<< HEAD - "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net).info.json": "e7319581afcdec1cfc5c42ffe20053b7", -======= - "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net).info.json": "23878cc3a8db1d836ec72261e4d7a95f", ->>>>>>> master + "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net).info.json": "cc20bc44f76eb329294ecb0114595466", "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net).mp4": "3d9c19835b03355d6fd5d00cd59dbe5b", "Season 2011/s2011.e0529 - Project Zombie ｜Official Trailer｜ (IP： mc.projectzombie.beastnode.net).nfo": "99e8f5da8ebb7bfbe6a27799465a39c0", "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜-thumb.jpg": "00ed383591779ffe98291de60f198fe9", -<<<<<<< HEAD - "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜.info.json": "616ed2e1cee91373502397028161ff8d", -======= - "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜.info.json": "e6f93de0450c83fdd90ba3f6cade5d07", ->>>>>>> master + "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜.info.json": "b8635b4e213f63d0389d9e310dae78e5", "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜.mp4": "4971cb2d4fa29460361031f3fa8e1ea9", "Season 2011/s2011.e0630 - Project Zombie ｜Fin｜.nfo": "7d751a80d3a2dec151602514278998c7", "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC]-thumb.jpg": "1718599d5189c65f7d8cf6acfa5ea851", -<<<<<<< HEAD - "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC].info.json": "2ec37d87b73784e9b5188909eef32541", -======= - "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC].info.json": "c1a04de7bc628b88b32a774f656e890a", ->>>>>>> master + "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC].info.json": "26ffbfa7dd9eaab4ca896ed01821755d", "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC].mp4": "55e9b0add08c48c9c66105da0def2426", "Season 2011/s2011.e1121 - Skyrim 'Ultra HD w⧸Mods' [PC].nfo": "40f104e94e69648ffe692137a9523412", "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜-thumb.jpg": "54ebe9df801b278fdd17b21afa8373a6", -<<<<<<< HEAD - "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜.info.json": "f1c5feaa81a7771927c1697294870a80", -======= - "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜.info.json": "7daa381b23f0cbb14d84661b706bd424", ->>>>>>> master + "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜.info.json": "b2100b696ca355dfe8a69935db661a30", "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜.mp4": "65e4ce53ed5ec4139995469f99477a50", "Season 2012/s2012.e0123 - Project Zombie ｜Map Trailer｜.nfo": "552328911403e2f8092d10b53ac44680", "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜-thumb.jpg": "e29d49433175de8a761af35c5307791f", -<<<<<<< HEAD - "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜.info.json": "ed830b4d20cffecab81e95134469a82a", -======= - "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜.info.json": "23bb9520f84cfb759f23b5dd4e820b21", ->>>>>>> master + "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜.info.json": "c25c0d80276113b10ab3bd30dd186cd0", "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜.mp4": "18620a8257a686beda65e54add4d4cd1", "Season 2013/s2013.e0719 - Project Zombie Rewind ｜Trailer｜.nfo": "bcb859f3ba37eafa902cd470bfa600c2", "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer-thumb.jpg": "705ca4e0d99b37e9ecdf6bfe4b90c59b", -<<<<<<< HEAD - "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer.info.json": "8c4c941e1251f49498d60d977b04b744", -======= - "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer.info.json": "2a0033e6f81b3a186241c3274b17c520", ->>>>>>> master + "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer.info.json": "77ac922edf69bcf25fab14392b7f8a4e", "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer.mp4": "82f6ee7253e1dbb83ae7215af08ffacc", "Season 2018/s2018.e1029 - Jesse's Minecraft Server ｜ Teaser Trailer.nfo": "c07d29f2f98ac674dffbcd1e55c860ff", "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id-thumb.jpg": "28d852ede73b879b9ebf9a061cfc7d46", "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.en.srt": "3d2c4e7f65d2ca5e96da38ce7eecfc4e", -<<<<<<< HEAD - "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.info.json": "64148d293c2dac43268ff48e83929ed7", -======= - "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.info.json": "8708fa01466ce60aa3a405c8aad08ac1", ->>>>>>> master + "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.info.json": "89ef929dc967e4e80ef51cbd19502c66", "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.mp4": "e733b4cc385b953b08c8eb0f47e03c1e", "Season 2018/s2018.e1102 - Jesse's Minecraft Server ｜ IP mc.jesse.id.nfo": "0a7aa028f2acf0380d00ce32bf72199a", "fanart.jpg": "129c6639b47299bc48062f0365e670ee", diff --git a/tests/e2e/resources/expected_downloads_summaries/youtube/test_playlist.json b/tests/e2e/resources/expected_downloads_summaries/youtube/test_playlist.json index a29fcf1d..59acd2e4 100644 --- a/tests/e2e/resources/expected_downloads_summaries/youtube/test_playlist.json +++ b/tests/e2e/resources/expected_downloads_summaries/youtube/test_playlist.json @@ -1,31 +1,16 @@ { ".ytdl-sub-music_video_playlist_test-download-archive.json": "25b8e44961343116436584e341c7fe9b", "JMC - Jesse's Minecraft Server [Trailer - Feb.1]-thumb.jpg": "b232d253df621aa770b780c1301d364d", -<<<<<<< HEAD - "JMC - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "a5858026c9cb2149760b9e18ac3ee91e", -======= - "JMC - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "2c8bf622feb28760376c76afe4a9f7b5", ->>>>>>> master + "JMC - Jesse's Minecraft Server [Trailer - Feb.1].info.json": "cbd6a34138c3044e37158ee1a3c89eea", "JMC - Jesse's Minecraft Server [Trailer - Feb.1].mp4": "e66287b9832277b6a4d1554e29d9fdcc", "JMC - Jesse's Minecraft Server [Trailer - Feb.1].nfo": "de6f9a17a5ebf92aa02b14f7342b8d36", "JMC - Jesse's Minecraft Server [Trailer - Feb.27]-thumb.jpg": "d17c379ea8b362f5b97c6b213b0342cb", -<<<<<<< HEAD - "JMC - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "1d0e20b597d15d2e9373b879f416d9db", -======= - "JMC - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "009323eb966a7ad9b47abcbe499fc6e2", ->>>>>>> master + "JMC - Jesse's Minecraft Server [Trailer - Feb.27].info.json": "b707a8d1741db62dd8b8470e7a2f9368", "JMC - Jesse's Minecraft Server [Trailer - Feb.27].mp4": "04ab5cb3cc12325d0c96a7cd04a8b91d", "JMC - Jesse's Minecraft Server [Trailer - Feb.27].nfo": "9a4a57bb91f1ac97b588fdf66bac4c9b", "JMC - Jesse's Minecraft Server [Trailer - Mar.21]-thumb.jpg": "e7830aa8a64b0cde65ba3f7e5fc56530", -<<<<<<< HEAD - "JMC - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "d998a4c3d7f22742cf016336addb8c55", + "JMC - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "509eebbb687bab378e36dac08b5cf989", "JMC - Jesse's Minecraft Server [Trailer - Mar.21].mp4": "025de6099a5c98e6397153c7a62d517d", "JMC - Jesse's Minecraft Server [Trailer - Mar.21].nfo": "b98f1fa3e76b4592aeeaed4f6e220809", - "tvshow.nfo": "792b0594defdfd6642086b76fcc6a91b" -======= - "JMC - Jesse's Minecraft Server [Trailer - Mar.21].info.json": "4bcc266ee276d45da869c37cd8caa084", - "JMC - Jesse's Minecraft Server [Trailer - Mar.21].mp4": "025de6099a5c98e6397153c7a62d517d", - "JMC - Jesse's Minecraft Server [Trailer - Mar.21].nfo": "f000a6ed8caacb62a134a6ca81e3f308", "tvshow.nfo": "e4123860532466ed5e0ebf2c9e44eb18" ->>>>>>> master } \ No newline at end of file