edited gitignore

.gitignore

@@ -1 +1,7 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
 *.mp3
+*.cache*

src/musify.py

@@ -39,10 +39,7 @@ def get_download_link(default_url):
 
     return f"https://musify.club/track/dl/{musify_id}/{musify_name}.mp3"
 
-<<<<<<< HEAD
-=======
 
->>>>>>> e923dcdaf208a95492af3afaa9e49fbbcfb9520c
 def download_from_musify(file, url):
     logging.info(f"downloading: '{url}'")
     r = session.get(url)

temp/.cache1.csv

@@ -1,14 +1,4 @@
 ,id,album,title,artist,album_artist,tracknumber,albumsort,titlesort,isrc,date,year,musicbrainz_artistid,musicbrainz_albumid,musicbrainz_albumartistid,musicbrainz_albumstatus,total_tracks,language,musicbrainz_albumtype,compilation,releasecountry,barcode
-<<<<<<< HEAD
-0,03634ecf-5ef1-4ec4-8c9a-89be5df6462d,Mate. Feed. Kill. Repeat.,Slipknot,['Slipknot'],Slipknot,1,2,1,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-1,c4d73bed-2164-4869-a274-db111f12f09f,Mate. Feed. Kill. Repeat.,Gently,['Slipknot'],Slipknot,2,2,2,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-2,1be117c9-9cad-4141-82c1-e0c07a5a0d09,Mate. Feed. Kill. Repeat.,Do Nothing / Bitchslap,['Slipknot'],Slipknot,3,2,3,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-3,e5eb92c4-89c1-46ba-819d-717f20753b17,Mate. Feed. Kill. Repeat.,Only One,['Slipknot'],Slipknot,4,2,4,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-4,2a0ece26-1d36-4fd1-84be-8dc018a599d1,Mate. Feed. Kill. Repeat.,Tattered & Torn,['Slipknot'],Slipknot,5,2,5,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-5,baf6624a-fc9c-4485-8beb-4aed5d8a0ea6,Mate. Feed. Kill. Repeat.,Confessions,['Slipknot'],Slipknot,6,2,6,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-6,42119c6c-74a6-4b73-a887-1b9e023db9a5,Mate. Feed. Kill. Repeat.,Some Feel,['Slipknot'],Slipknot,7,2,7,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-7,a4c44e11-ff51-49f5-b100-658f4e263a59,Mate. Feed. Kill. Repeat.,Killers Are Quiet / Dogfish Rising,['Slipknot'],Slipknot,8,2,8,,1996-10-31,1996,a466c2a2-6517-42fb-a160-1087c3bafd9f,ce4722b7-7d58-4f7d-b76d-cb4b37fb661b,a466c2a2-6517-42fb-a160-1087c3bafd9f,Official,8,eng,Album,,US,742617000027
-=======
 0,ba953d81-663e-4acc-90d7-c86005960341,Pain Remains,"Welcome Back, O’ Sleeping Dreamer",['Lorna Shore'],Lorna Shore,1,0,1,,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
 1,b7b623b0-a64d-40b4-b6cb-b1b45a3b0d91,Pain Remains,Into the Earth,['Lorna Shore'],Lorna Shore,2,0,2,,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
 2,7dfa4dd2-1ac7-4b17-91b4-fcdc1f859b74,Pain Remains,Sun//Eater,['Lorna Shore'],Lorna Shore,3,0,3,GBDHC2334003,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
@@ -19,4 +9,3 @@
 7,4a1dca7c-2409-40e3-9dfa-3ae26789db18,Pain Remains,Pain Remains I: Dancing Like Flames,['Lorna Shore'],Lorna Shore,8,0,8,GBDHC2334008,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
 8,af01b1dc-f14e-4d02-b91a-d059b235f452,Pain Remains,"Pain Remains II: After All I’ve Done, I’ll Disappear",['Lorna Shore'],Lorna Shore,9,0,9,GBDHC2334009,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
 9,b9ead1a7-b054-4a8a-8e36-e860ab7e8d5f,Pain Remains,Pain Remains III: In a Sea of Fire,['Lorna Shore'],Lorna Shore,10,0,10,,2022-10-14,2022,e86fc1f5-d632-44b2-8aea-38f83aadffe8,7d70eb7f-68b0-4c20-aa17-bfb414f88f4c,e86fc1f5-d632-44b2-8aea-38f83aadffe8,Official,10,eng,Album,,XW,886449882830
->>>>>>> e923dcdaf208a95492af3afaa9e49fbbcfb9520c