Auto-DLP 2025.6.35__py3-none-any.whl → 2025.6.37__py3-none-any.whl

auto_dlp/downloader.py

@@ -111,9 +111,9 @@ def get_song_file(song_id, config):
     return path
 
 
-def delete_cached_version(song_id: str):
+def delete_cached_version(artist: str, song_id: str):
     song_file: Path = _try_get_song_file(song_id)
     if song_file is not None:
-        # path.unlink(missing_ok=True) # Stuff is no longer just deleted
-        fs.touch_folder(fs.download_cache_trash())
-        shutil.move(song_file, fs.download_cache_trash() / song_file.name)
+        directory = fs.download_cache_trash() / artist
+        fs.touch_folder(directory)
+        shutil.move(song_file, folder / song_file.name)

auto_dlp/redownloading.py

@@ -53,7 +53,7 @@ class SongWrapper:
         if file is None: return
         print(f"Deleting {self}: {file}")
         file.unlink(missing_ok=True)
-        downloader.delete_cached_version(self.oid)
+        downloader.delete_cached_version(self.artist.name, self.oid)
 
 
 # Yields: song name, song id and artist
@@ -85,14 +85,14 @@ def _iter_playlists(config, artist=None):
 def _get_obj_locations(config, obj_id):
     obj_re = re.compile(obj_id, flags=re.IGNORECASE)
 
-    for song in _iter_songs(config):
-        if song.oid == obj_id or obj_re.fullmatch(song.name) is not None:
-            yield song
-
     for playlist in _iter_playlists(config):
         if playlist.oid == obj_id or obj_re.fullmatch(playlist.name) is not None:
             yield playlist
 
+    for song in _iter_songs(config):
+        if song.oid == obj_id or obj_re.fullmatch(song.name) is not None:
+            yield song
+
 
 def redownload(config, obj_id):
     matches = list(_get_obj_locations(config, obj_id))

auto_dlp/version.py

@@ -1 +1 @@
-program_version = "2025.6.35"
+program_version = "2025.6.37"

{auto_dlp-2025.6.35.dist-info → auto_dlp-2025.6.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Auto-DLP
-Version: 2025.6.35
+Version: 2025.6.37
 Summary: A simple and lightweight system for downloading and managing youtube playlists and songs (based on yt-dlp)
 Author-email: Vorak <5m9mnf37q@mozmail.com>
 License-File: LICENSE.txt

{auto_dlp-2025.6.35.dist-info → auto_dlp-2025.6.37.dist-info}/RECORD

@@ -9,7 +9,7 @@ auto_dlp/channels.py,sha256=wX7SekCbxZqEKUXJJqDjZUmWTmGJyw2rv4XvjaUzdtg,595
 auto_dlp/codecs.py,sha256=7MY_u_X9IRieBjfbGmJH0As4qUAKd6IbvRiJgunAU4o,99
 auto_dlp/config_intepreter.py,sha256=yOMYN3LyS5HV4cI9k5vxttBaoYequPC94x3YNUSfmz4,9789
 auto_dlp/download_manager.py,sha256=sJXfvEgwGeVcKDqeWMcZzqiEOQLmURFE-UiAYY9gplI,2251
-auto_dlp/downloader.py,sha256=aPtwSwlBQ_EBK8of2pA_2V1N_Ttv8UprCSJ5FyhjDas,3620
+auto_dlp/downloader.py,sha256=bnNUUSYYuvyw5QRNjriUrOlpI9EF3EZkLoqxy0YxOl4,3580
 auto_dlp/example_file.py,sha256=Ouk2MNGENR9DUAyz5fsy5pvPDrxK2BVWyut1KM7JGpI,1583
 auto_dlp/ffmpeg.py,sha256=dj6rEjVuk9QMw_Tg7YS6KGSRq9hTOARXQAHXxltAc0o,1473
 auto_dlp/file_cleaning.py,sha256=OmQNIC7QSH6gFHnxngZWO_3WUgzivG8OVJMrr3VSieo,1017
@@ -18,15 +18,15 @@ auto_dlp/fs_sync.py,sha256=Pab9IbhI-MCL_-v4i3PT6ESRvgSrqo7mpC94je-ONHQ,80
 auto_dlp/metadata.py,sha256=GZ7mjnyET1_YUksN1KGG_NvwPxvQLDAJr6wfRY7zJZQ,2506
 auto_dlp/name_cleaning.py,sha256=Ryx7FmBHqDIF_XeYqHHTJTaRcozJ0frzpfYbzYkNg9c,1530
 auto_dlp/playlist_items.py,sha256=13BEryw_n4mo7R_gt9ewWfcGra2397P7cPN6FhFCZVk,1789
-auto_dlp/redownloading.py,sha256=cLWaVg5Qc0Zw8hy7BcuM-8dladDHW-njW6DSoPPvRQU,3388
+auto_dlp/redownloading.py,sha256=Lmu02M6JRpSwpV7FHT_6gAMrbSe4QQhQWOy_n_xM1ro,3406
 auto_dlp/terminal_formatting.py,sha256=bFEOXB0EwfK95L1xrBGwsBmT6fkNXRDGE82JW1GAnhY,77
 auto_dlp/thumbnails.py,sha256=PEDQgd-kbl9ZSAIUgrW5Oc_-G1-4J4H-Mi4736gt6sI,1467
 auto_dlp/unavailable_items.py,sha256=7tLKIJ8aa1jqF5JZ_UOlqmTn9ieFFpDK6EbozL6-Qy0,666
 auto_dlp/utils.py,sha256=Qsfy1pzQMCQwDJuSmE5v71eGhRRt0hSpak_S2AEQRJw,937
 auto_dlp/variables.py,sha256=m5Ymc17pfjfjQwmQlWJp9Qt-Fi6uN5_hbpWO98oLC-0,18
-auto_dlp/version.py,sha256=RarYM48Q6cAtMpqHgJEr5L0jkfGtZGuCgzEziUE0QWY,29
-auto_dlp-2025.6.35.dist-info/METADATA,sha256=MHsj-jxKU8t6UUPdAvJRyZBiH1aPojVO6DZdcHdYWjM,5585
-auto_dlp-2025.6.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-auto_dlp-2025.6.35.dist-info/entry_points.txt,sha256=tXzdP_Yx88UaxQj1K3eeMF6LjKDMlN_OOcgq0Io4bUs,58
-auto_dlp-2025.6.35.dist-info/licenses/LICENSE.txt,sha256=kjGr1EnB89PoRKf-Bzx0I7DB-aNHtQk6kPYAEA--rZk,1069
-auto_dlp-2025.6.35.dist-info/RECORD,,
+auto_dlp/version.py,sha256=vJN8TOmmi-RbpAc2bJx7mUsDZ_-nMLe18HPOgucbHmE,29
+auto_dlp-2025.6.37.dist-info/METADATA,sha256=5_ofHQUOhseUUyJc5MtPKY4SQRUaBBCcz1u_kiUz4Yo,5585
+auto_dlp-2025.6.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+auto_dlp-2025.6.37.dist-info/entry_points.txt,sha256=tXzdP_Yx88UaxQj1K3eeMF6LjKDMlN_OOcgq0Io4bUs,58
+auto_dlp-2025.6.37.dist-info/licenses/LICENSE.txt,sha256=kjGr1EnB89PoRKf-Bzx0I7DB-aNHtQk6kPYAEA--rZk,1069
+auto_dlp-2025.6.37.dist-info/RECORD,,