From b972ec01b696267653aaa753e15995cd5b4af720 Mon Sep 17 00:00:00 2001 From: Robert Honz Date: Sat, 20 Apr 2024 11:54:46 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20`album=5Fid`=20can=20be=20used=20as?= =?UTF-8?q?=20a=20placeholder=20for=20album=20namings.=20`album=5Fyear`=20?= =?UTF-8?q?can=20also=20be=20used=20within=20track=20namings.=20Fixes=20#8?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tidal_dl_ng/gui.py | 6 +++--- tidal_dl_ng/helper/path.py | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tidal_dl_ng/gui.py b/tidal_dl_ng/gui.py index 45f835d..5930483 100644 --- a/tidal_dl_ng/gui.py +++ b/tidal_dl_ng/gui.py @@ -463,7 +463,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): duration_sec=item.duration, obj=item, quality=quality_audio_highest(item), - explicit=item.explicit, + explicit=bool(item.explicit), ) result.append(result_item) @@ -476,7 +476,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): duration_sec=item.duration, obj=item, quality=item.video_quality, - explicit=item.explicit, + explicit=bool(item.explicit), ) result.append(result_item) @@ -502,7 +502,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): duration_sec=item.duration, obj=item, quality=quality_audio_highest(item), - explicit=item.explicit, + explicit=bool(item.explicit), ) result.append(result_item) diff --git a/tidal_dl_ng/helper/path.py b/tidal_dl_ng/helper/path.py index f24bdaf..0af1b25 100644 --- a/tidal_dl_ng/helper/path.py +++ b/tidal_dl_ng/helper/path.py @@ -101,6 +101,9 @@ def format_str_media(name: str, media: Track | Album | Playlist | UserPlaylist | case "playlist_id": if isinstance(media, Playlist): result = media.id + case "album_id": + if isinstance(media, Album): + result = media.id case "track_duration_seconds": if isinstance(media, Track | Video): result = str(media.duration) @@ -124,7 +127,9 @@ def format_str_media(name: str, media: Track | Album | Playlist | UserPlaylist | result = f"{m:01d}:{s:02d}" case "album_year": if isinstance(media, Album): - result = str(media.release_date.year) + result = str(media.year) + elif isinstance(media, Track): + result = str(media.album.year) case "video_quality": if isinstance(media, Video): result = media.video_quality