Merge pull request #56 from oskvr37/dev

Merge dev
oskvr37 · Nov 26, 2024 · 65f55cb · 65f55cb
2 parents 89e0292 + eee7b3d
commit 65f55cb
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 46 deletions.
diff --git a/scripts/sync.py b/scripts/sync.py
diff --git a/setup.py b/setup.py
@@ -2,14 +2,14 @@
 
 setup(
     name="tiddl",
-    version="1.8.2",
+    version="1.8.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",
     readme="README.md",
     author="oskvr37",
     packages=find_packages(),
     entry_points={
-        "console_scripts": ["tiddl=tiddl:main", "tiddl-sync=scripts.sync:main"],
+        "console_scripts": ["tiddl=tiddl:main"],
     },
 )
diff --git a/tiddl/__init__.py b/tiddl/__init__.py
@@ -140,6 +140,9 @@ def downloadTrack(
         playlist="",
         cover_data=b"",
     ) -> tuple[str, str]:
+        if track.get("status") == 404:
+            raise ValueError(track)
+
         file_dir, file_name = formatFilename(file_template, track, playlist)
 
         file_path = f"{download_path}/{file_dir}/{file_name}"
@@ -210,17 +213,21 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
 
         for item in album_items["items"]:
             track = item["item"]
-            file_dir, file_name = downloadTrack(
-                track,
-                file_template=args.file_template
-                or config["settings"]["album_template"],
-                skip_existing=skip_existing,
-                sleep=True,
-                cover_data=album_cover.content,
-            )
+            try:
+                file_dir, file_name = downloadTrack(
+                    track,
+                    file_template=args.file_template
+                    or config["settings"]["album_template"],
+                    skip_existing=skip_existing,
+                    sleep=True,
+                    cover_data=album_cover.content,
+                )
+
+                if SAVE_COVER:
+                    album_cover.save(f"{download_path}/{file_dir}")
 
-            if SAVE_COVER:
-                album_cover.save(f"{download_path}/{file_dir}")
+            except ValueError:
+                logger.warning(f"track unavailable")
 
     skip_existing = not args.no_skip
     failed_input = []
@@ -244,11 +251,14 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
             case "track":
                 track = api.getTrack(input_id)
 
-                downloadTrack(
-                    track,
-                    file_template=track_template,
-                    skip_existing=skip_existing,
-                )
+                try:
+                    downloadTrack(
+                        track,
+                        file_template=track_template,
+                        skip_existing=skip_existing,
+                    )
+                except ValueError as e:
+                    logger.warning(f"track unavailable")
 
                 continue
 
@@ -301,18 +311,21 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
                     track = item["item"]
 
                     track["playlistNumber"] = index
-
-                    file_dir, file_name = downloadTrack(
-                        track,
-                        file_template=args.file_template
-                        or config["settings"]["playlist_template"],
-                        skip_existing=skip_existing,
-                        sleep=True,
-                        playlist=playlist["title"],
-                    )
-
-                    if SAVE_COVER:
-                        playlist_cover.save(f"{download_path}/{file_dir}")
+                    try:
+                        file_dir, file_name = downloadTrack(
+                            track,
+                            file_template=args.file_template
+                            or config["settings"]["playlist_template"],
+                            skip_existing=skip_existing,
+                            sleep=True,
+                            playlist=playlist["title"],
+                        )
+
+                        if SAVE_COVER:
+                            playlist_cover.save(f"{download_path}/{file_dir}")
+
+                    except ValueError as e:
+                        logger.warning(f"track unavailable")
 
                 continue