👷 Check if albums and videos are available or not due to regional restrictions. Fixes #277
This commit is contained in:
+14
-3
@@ -334,10 +334,10 @@ class Download:
|
|||||||
if media_id and media_type:
|
if media_id and media_type:
|
||||||
# If no media instance is provided, we need to create the media instance.
|
# If no media instance is provided, we need to create the media instance.
|
||||||
media = instantiate_media(self.session, media_type, media_id)
|
media = instantiate_media(self.session, media_type, media_id)
|
||||||
elif isinstance(media, Track): # Check if media is available not deactivated / removed from TIDAL.
|
elif isinstance(media, Track) or isinstance(media, Video): # Check if media is available not deactivated / removed from TIDAL.
|
||||||
if not media.available:
|
if not media.available:
|
||||||
self.fn_logger.info(
|
self.fn_logger.info(
|
||||||
f"This track is not available for listening anymore on TIDAL. Skipping: {name_builder_item(media)}"
|
f"This item is not available for listening anymore on TIDAL. Skipping: {name_builder_item(media)}"
|
||||||
)
|
)
|
||||||
|
|
||||||
return False, ""
|
return False, ""
|
||||||
@@ -714,11 +714,22 @@ class Download:
|
|||||||
quality_audio: Quality | None = None,
|
quality_audio: Quality | None = None,
|
||||||
quality_video: QualityVideo | None = None,
|
quality_video: QualityVideo | None = None,
|
||||||
):
|
):
|
||||||
# If no media instance is provided, we need to create the media instance.
|
try:
|
||||||
if media_id and media_type:
|
if media_id and media_type:
|
||||||
|
# If no media instance is provided, we need to create the media instance.
|
||||||
|
# Throws `tidalapi.exceptions.ObjectNotFound` if item is not available anymore.
|
||||||
media = instantiate_media(self.session, media_type, media_id)
|
media = instantiate_media(self.session, media_type, media_id)
|
||||||
|
elif isinstance(media, Album): # Check if media is available not deactivated / removed from TIDAL.
|
||||||
|
if not media.available:
|
||||||
|
self.fn_logger.info(
|
||||||
|
f"This item is not available for listening anymore on TIDAL. Skipping: {name_builder_title(media)}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return
|
||||||
elif not media:
|
elif not media:
|
||||||
raise MediaMissing
|
raise MediaMissing
|
||||||
|
except:
|
||||||
|
return
|
||||||
|
|
||||||
# Create file name and path
|
# Create file name and path
|
||||||
file_name_relative: str = format_path_media(file_template, media, self.settings.data.album_track_num_pad_min)
|
file_name_relative: str = format_path_media(file_template, media, self.settings.data.album_track_num_pad_min)
|
||||||
|
|||||||
Reference in New Issue
Block a user