adjust song is not available message

This commit is contained in:
alacleaker 2024-04-08 21:04:22 -03:00
parent 62c695b5ff
commit e40668e6ec
2 changed files with 5 additions and 8 deletions

View File

@ -491,14 +491,9 @@ def main(
)
else:
stream_info = downloader_song.get_stream_info(track)
if not stream_info.pssh:
if not stream_info.stream_url:
logger.warning(
f"({queue_progress}) Song does not contain Widevine DRM, skipping"
)
continue
elif not stream_info.stream_url:
logger.warning(
f"({queue_progress}) Song is not available with the selected codec, skipping"
f"({queue_progress}) Song is not downloadable, skipping"
)
continue
logger.debug("Getting decryption key")

View File

@ -43,7 +43,7 @@ class DownloaderSong:
None,
)
if not drm_info_raw:
raise Exception("DRM info not found")
return None
return json.loads(base64.b64decode(drm_info_raw["value"]).decode("utf-8"))
def get_asset_infos(self, m3u8_data: dict) -> dict:
@ -114,6 +114,8 @@ class DownloaderSong:
m3u8_obj = m3u8.load(m3u8_url)
m3u8_data = m3u8_obj.data
drm_infos = self.get_drm_infos(m3u8_data)
if not drm_infos:
return stream_info
asset_infos = self.get_asset_infos(m3u8_data)
if self.codec == SongCodec.ASK:
playlist = self.get_playlist_from_user(m3u8_data)