diff --git a/tidal_dl_ng/cli.py b/tidal_dl_ng/cli.py index bbd66cc..3394232 100644 --- a/tidal_dl_ng/cli.py +++ b/tidal_dl_ng/cli.py @@ -166,7 +166,7 @@ def download( # Create Live display for Progress. with Live(progress_table, refresh_per_second=10): # Download media. - if media_type in [MediaType.Track, MediaType.Video]: + if media_type in [MediaType.TRACK, MediaType.VIDEO]: dl.item( media_id=item_id, media_type=media_type, @@ -175,7 +175,7 @@ def download( progress=progress, fn_logger=fn_logger, ) - elif media_type in [MediaType.Album, MediaType.Playlist, MediaType.Mix]: + elif media_type in [MediaType.ALBUM, MediaType.PLAYLIST, MediaType.MIX]: dl.items( media_id=item_id, media_type=media_type, diff --git a/tidal_dl_ng/constants.py b/tidal_dl_ng/constants.py index 20a2c49..940b2dc 100644 --- a/tidal_dl_ng/constants.py +++ b/tidal_dl_ng/constants.py @@ -12,11 +12,11 @@ class QualityVideo(Enum): class MediaType(Enum): - Track: str = "track" - Video: str = "video" - Playlist: str = "playlist" - Album: str = "album" - Mix: str = "mix" + TRACK: str = "track" + VIDEO: str = "video" + PLAYLIST: str = "playlist" + ALBUM: str = "album" + MIX: str = "mix" class SkipExisting(Enum): diff --git a/tidal_dl_ng/download.py b/tidal_dl_ng/download.py index 949734c..5d219de 100644 --- a/tidal_dl_ng/download.py +++ b/tidal_dl_ng/download.py @@ -138,18 +138,18 @@ class Download: def instantiate_media( self, session: Session, - media_type: type[MediaType.Track, MediaType.Video, MediaType.Album, MediaType.Playlist, MediaType.Mix], + media_type: type[MediaType.TRACK, MediaType.VIDEO, MediaType.ALBUM, MediaType.PLAYLIST, MediaType.MIX], id_media: str, ) -> Track | Video: - if media_type == MediaType.Track: + if media_type == MediaType.TRACK: media = Track(session, id_media) - elif media_type == MediaType.Video: + elif media_type == MediaType.VIDEO: media = Video(session, id_media) - elif media_type == MediaType.Album: + elif media_type == MediaType.ALBUM: media = Album(self.session, id_media) - elif media_type == MediaType.Playlist: + elif media_type == MediaType.PLAYLIST: media = Playlist(self.session, id_media) - elif media_type == MediaType.Mix: + elif media_type == MediaType.MIX: media = Mix(self.session, id_media) else: raise MediaUnknown diff --git a/tidal_dl_ng/helper/path.py b/tidal_dl_ng/helper/path.py index 06ccdb1..fc8602c 100644 --- a/tidal_dl_ng/helper/path.py +++ b/tidal_dl_ng/helper/path.py @@ -154,15 +154,15 @@ def get_format_template( ) -> str | bool: result = False - if isinstance(media, Track) or media == MediaType.Track: + if isinstance(media, Track) or media == MediaType.TRACK: result = settings.data.format_track - elif isinstance(media, Album) or media == MediaType.Album: + elif isinstance(media, Album) or media == MediaType.ALBUM: result = settings.data.format_album - elif isinstance(media, Playlist | UserPlaylist) or media == MediaType.Playlist: + elif isinstance(media, Playlist | UserPlaylist) or media == MediaType.PLAYLIST: result = settings.data.format_playlist - elif isinstance(media, Mix) or media == MediaType.Mix: + elif isinstance(media, Mix) or media == MediaType.MIX: result = settings.data.format_mix - elif isinstance(media, Video) or media == MediaType.Video: + elif isinstance(media, Video) or media == MediaType.VIDEO: result = settings.data.format_video return result diff --git a/tidal_dl_ng/helper/tidal.py b/tidal_dl_ng/helper/tidal.py index a48abcd..5c73b10 100644 --- a/tidal_dl_ng/helper/tidal.py +++ b/tidal_dl_ng/helper/tidal.py @@ -30,14 +30,14 @@ def get_tidal_media_type(url_media: str) -> MediaType | bool: media_name = url_media.split("/")[-2] if media_name == "track": - result = MediaType.Track + result = MediaType.TRACK elif media_name == "video": - result = MediaType.Video + result = MediaType.VIDEO elif media_name == "album": - result = MediaType.Album + result = MediaType.ALBUM elif media_name == "playlist": - result = MediaType.Playlist + result = MediaType.PLAYLIST elif media_name == "mix": - result = MediaType.Mix + result = MediaType.MIX return result