summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Honz <exislow+github@gmail.com>2024-03-25 16:53:27 +0100
committerRobert Honz <exislow+github@gmail.com>2024-03-25 16:53:27 +0100
commitf7361b307853999385452c5d801a4d132076c008 (patch)
treed42d5091d6110a97837b30f7c8605284599728ea
parent453205bf48d45e7abeed91671375a8d602343684 (diff)
downloadtidal-dl-ng-f7361b307853999385452c5d801a4d132076c008.tar.gz
✨ Use `Album.image()` to get cover url.
-rw-r--r--tidal_dl_ng/constants.py8
-rw-r--r--tidal_dl_ng/download.py11
-rw-r--r--tidal_dl_ng/metadata.py3
-rw-r--r--tidal_dl_ng/ui/default_album_image.pngbin0 -> 4960 bytes
-rw-r--r--tidal_dl_ng/ui/main.ui2
-rw-r--r--tidal_dl_ng/ui/placeholder_cover.jpgbin32346 -> 0 bytes
6 files changed, 9 insertions, 15 deletions
diff --git a/tidal_dl_ng/constants.py b/tidal_dl_ng/constants.py
index 2e53eb7..e1780e3 100644
--- a/tidal_dl_ng/constants.py
+++ b/tidal_dl_ng/constants.py
@@ -36,9 +36,11 @@ class StreamManifestMimeType(Enum):
class CoverDimensions(Enum):
- Px320: str = "320x320"
- Px640: str = "640x640"
- Px1280: str = "1280x1280"
+ Px80: int = 80
+ Px160: int = 160
+ Px320: int = 320
+ Px640: int = 640
+ Px1280: int = 1280
class TidalLists(Enum):
diff --git a/tidal_dl_ng/download.py b/tidal_dl_ng/download.py
index 2afdf20..5c508c2 100644
--- a/tidal_dl_ng/download.py
+++ b/tidal_dl_ng/download.py
@@ -21,7 +21,6 @@ from tidal_dl_ng.constants import (
EXTENSION_LYRICS,
REQUESTS_TIMEOUT_SEC,
AudioExtensions,
- CoverDimensions,
MediaType,
SkipExisting,
StreamManifestMimeType,
@@ -271,12 +270,6 @@ class Download:
# Move it.
shutil.move(tmp_lyrics_file_path, os.path.splitext(file_media_dst)[0] + EXTENSION_LYRICS)
- def cover_url(self, sid: str, dimension: CoverDimensions = CoverDimensions.Px320):
- if sid is None:
- return ""
-
- return f"https://resources.tidal.com/images/{sid.replace('-', '/')}/{dimension.value}.jpg"
-
def lyrics_write_file(self, file_path: str, lyrics: str) -> str:
result: str = file_path
@@ -331,9 +324,7 @@ class Download:
totaltrack=track.album.num_tracks if track.album and track.album.num_tracks else 1,
totaldisc=track.album.num_volumes if track.album and track.album.num_volumes else 1,
discnumber=track.volume_num if track.volume_num else 1,
- url_cover=(
- self.cover_url(track.album.cover, self.settings.data.metadata_cover_dimension) if track.album else ""
- ),
+ url_cover=track.album.image(self.settings.data.metadata_cover_dimension),
)
m.save()
diff --git a/tidal_dl_ng/metadata.py b/tidal_dl_ng/metadata.py
index 4506742..35029f8 100644
--- a/tidal_dl_ng/metadata.py
+++ b/tidal_dl_ng/metadata.py
@@ -142,7 +142,8 @@ class Metadata:
self.m.tags["\xa9wrt"] = ", ".join(self.composer) if self.composer else ""
self.m.tags["\xa9lyr"] = self.lyrics
- def cover_data(self, url: str = None, path_file: str = None) -> str | bytes:
+ @staticmethod
+ def cover_data(url: str = None, path_file: str = None) -> str | bytes:
result: str | bytes = ""
if url:
diff --git a/tidal_dl_ng/ui/default_album_image.png b/tidal_dl_ng/ui/default_album_image.png
new file mode 100644
index 0000000..0ab51f1
--- /dev/null
+++ b/tidal_dl_ng/ui/default_album_image.png
Binary files differ
diff --git a/tidal_dl_ng/ui/main.ui b/tidal_dl_ng/ui/main.ui
index 3077449..2e76e30 100644
--- a/tidal_dl_ng/ui/main.ui
+++ b/tidal_dl_ng/ui/main.ui
@@ -543,7 +543,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap>placeholder_cover.jpg</pixmap>
+ <pixmap>default_album_image.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
diff --git a/tidal_dl_ng/ui/placeholder_cover.jpg b/tidal_dl_ng/ui/placeholder_cover.jpg
deleted file mode 100644
index a06ab92..0000000
--- a/tidal_dl_ng/ui/placeholder_cover.jpg
+++ /dev/null
Binary files differ