♻️ Capitalized enum names..
This commit is contained in:
+2
-2
@@ -166,7 +166,7 @@ def download(
|
|||||||
# Create Live display for Progress.
|
# Create Live display for Progress.
|
||||||
with Live(progress_table, refresh_per_second=10):
|
with Live(progress_table, refresh_per_second=10):
|
||||||
# Download media.
|
# Download media.
|
||||||
if media_type in [MediaType.Track, MediaType.Video]:
|
if media_type in [MediaType.TRACK, MediaType.VIDEO]:
|
||||||
dl.item(
|
dl.item(
|
||||||
media_id=item_id,
|
media_id=item_id,
|
||||||
media_type=media_type,
|
media_type=media_type,
|
||||||
@@ -175,7 +175,7 @@ def download(
|
|||||||
progress=progress,
|
progress=progress,
|
||||||
fn_logger=fn_logger,
|
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(
|
dl.items(
|
||||||
media_id=item_id,
|
media_id=item_id,
|
||||||
media_type=media_type,
|
media_type=media_type,
|
||||||
|
|||||||
@@ -12,11 +12,11 @@ class QualityVideo(Enum):
|
|||||||
|
|
||||||
|
|
||||||
class MediaType(Enum):
|
class MediaType(Enum):
|
||||||
Track: str = "track"
|
TRACK: str = "track"
|
||||||
Video: str = "video"
|
VIDEO: str = "video"
|
||||||
Playlist: str = "playlist"
|
PLAYLIST: str = "playlist"
|
||||||
Album: str = "album"
|
ALBUM: str = "album"
|
||||||
Mix: str = "mix"
|
MIX: str = "mix"
|
||||||
|
|
||||||
|
|
||||||
class SkipExisting(Enum):
|
class SkipExisting(Enum):
|
||||||
|
|||||||
@@ -138,18 +138,18 @@ class Download:
|
|||||||
def instantiate_media(
|
def instantiate_media(
|
||||||
self,
|
self,
|
||||||
session: Session,
|
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,
|
id_media: str,
|
||||||
) -> Track | Video:
|
) -> Track | Video:
|
||||||
if media_type == MediaType.Track:
|
if media_type == MediaType.TRACK:
|
||||||
media = Track(session, id_media)
|
media = Track(session, id_media)
|
||||||
elif media_type == MediaType.Video:
|
elif media_type == MediaType.VIDEO:
|
||||||
media = Video(session, id_media)
|
media = Video(session, id_media)
|
||||||
elif media_type == MediaType.Album:
|
elif media_type == MediaType.ALBUM:
|
||||||
media = Album(self.session, id_media)
|
media = Album(self.session, id_media)
|
||||||
elif media_type == MediaType.Playlist:
|
elif media_type == MediaType.PLAYLIST:
|
||||||
media = Playlist(self.session, id_media)
|
media = Playlist(self.session, id_media)
|
||||||
elif media_type == MediaType.Mix:
|
elif media_type == MediaType.MIX:
|
||||||
media = Mix(self.session, id_media)
|
media = Mix(self.session, id_media)
|
||||||
else:
|
else:
|
||||||
raise MediaUnknown
|
raise MediaUnknown
|
||||||
|
|||||||
@@ -154,15 +154,15 @@ def get_format_template(
|
|||||||
) -> str | bool:
|
) -> str | bool:
|
||||||
result = False
|
result = False
|
||||||
|
|
||||||
if isinstance(media, Track) or media == MediaType.Track:
|
if isinstance(media, Track) or media == MediaType.TRACK:
|
||||||
result = settings.data.format_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
|
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
|
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
|
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
|
result = settings.data.format_video
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -30,14 +30,14 @@ def get_tidal_media_type(url_media: str) -> MediaType | bool:
|
|||||||
media_name = url_media.split("/")[-2]
|
media_name = url_media.split("/")[-2]
|
||||||
|
|
||||||
if media_name == "track":
|
if media_name == "track":
|
||||||
result = MediaType.Track
|
result = MediaType.TRACK
|
||||||
elif media_name == "video":
|
elif media_name == "video":
|
||||||
result = MediaType.Video
|
result = MediaType.VIDEO
|
||||||
elif media_name == "album":
|
elif media_name == "album":
|
||||||
result = MediaType.Album
|
result = MediaType.ALBUM
|
||||||
elif media_name == "playlist":
|
elif media_name == "playlist":
|
||||||
result = MediaType.Playlist
|
result = MediaType.PLAYLIST
|
||||||
elif media_name == "mix":
|
elif media_name == "mix":
|
||||||
result = MediaType.Mix
|
result = MediaType.MIX
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user