Auto-DLP 2025.6.35__tar.gz → 2025.6.37__tar.gz

{auto_dlp-2025.6.35 → auto_dlp-2025.6.37}/PKG-INFO

@@ -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 → auto_dlp-2025.6.37}/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-2025.6.35 → auto_dlp-2025.6.37}/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-2025.6.37/auto_dlp/version.py

@@ -0,0 +1 @@
+program_version = "2025.6.37"

{auto_dlp-2025.6.35 → auto_dlp-2025.6.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "Auto-DLP"
-version = "2025.6.35" # vinc
+version = "2025.6.37" # vinc
 authors = [
     { name = "Vorak", email = "5m9mnf37q@mozmail.com" },
 ]

{auto_dlp-2025.6.35 → auto_dlp-2025.6.37}/vinc.json

@@ -1,9 +1,9 @@
 {
 	"template": "<YEAR>.<MONTH>.<COUNTER>",
-	"version": "2025.6.35",
+	"version": "2025.6.37",
 	"YEAR": 2025,
 	"MONTH": 6,
-	"COUNTER": 35,
+	"COUNTER": 37,
 	"targets": {
 		"pyproject.toml": {
 			"find": "\"<VERSION>\"\\s*#\\s*vinc",

auto_dlp-2025.6.35/auto_dlp/version.py

@@ -1 +0,0 @@
-program_version = "2025.6.35"