Merge pull request #65 from oskvr37/1.9

1.9

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="tiddl",
-    version="1.9.2",
+    version="1.9.3",
     description="TIDDL (Tidal Downloader) is a Python CLI application that allows downloading Tidal tracks.",
     long_description=open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",

tiddl/__init__.py

@@ -217,6 +217,11 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
 
         for item in album_items["items"]:
             track = item["item"]
+
+            if item["type"] != "track":
+                logger.warning(f"item is not a track: {track["title"]} ({track["id"]})")
+                continue
+
             try:
                 file_dir, file_name = downloadTrack(
                     track,

tiddl/utils.py

@@ -72,6 +72,7 @@ class FormattedTrack(TypedDict):
     released: str
     year: str
     playlist_number: str
+    version: str
 
 
 def formatFilename(template: str, track: Track, playlist=""):
@@ -82,6 +83,8 @@ def formatFilename(template: str, track: Track, playlist=""):
         "%Y-%m-%dT%H:%M:%S.000+0000",
     )
 
+    version = track.get("version", "")
+
     formatted_track: FormattedTrack = {
         "album": re.sub(r'[<>:"|?*/\\]', "_", track["album"]["title"].strip()),
         "artist": track["artist"]["name"].strip(),
@@ -94,6 +97,7 @@ def formatFilename(template: str, track: Track, playlist=""):
         "released": release_date.strftime("%m-%d-%Y"),
         "year": release_date.strftime("%Y"),
         "playlist_number": str(track.get("playlistNumber", "")),
+        "version": f"({version})" if version else "",
     }
 
     dirs = template.split("/")