fix #66

oskvr37 · Jan 15, 2025 · 9602b29 · 9602b29
1 parent 8eaf49c
commit 9602b29
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/tiddl/__init__.py b/tiddl/__init__.py
@@ -140,11 +140,8 @@ def downloadTrack(
         playlist="",
         cover_data=b"",
     ) -> tuple[str, str]:
-        if track.get("status") == 404:
-            raise ValueError(track)
-
-        if not track["allowStreaming"]:
-            logger.warning(
+        if track.get("status", 200) != 200 or not track["allowStreaming"]:
+            raise ValueError(
                 f"The track is not streamable: {track["title"]} ({track["id"]})"
             )
 
@@ -240,8 +237,8 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
                 if SAVE_COVER:
                     album_cover.save(f"{download_path}/{file_dir}")
 
-            except ValueError:
-                logger.warning(f"track unavailable")
+            except ValueError as e:
+                logger.error(e)
 
     skip_existing = not args.no_skip
     failed_input = []
@@ -269,11 +266,14 @@ def downloadAlbum(album_id: str | int, skip_existing: bool):
                     logger.warning(f"{e.error['userMessage']} ({e.error['status']})")
                     continue
 
-                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.error(e)
 
                 continue