mirror of
https://github.com/glomatico/votify.git
synced 2026-10-08 17:02:26 +02:00
Use VotifyNoCdmException; remove no_drm guards
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import logging
|
||||
|
||||
from .episode import SpotifyEpisodeInterface
|
||||
from .exceptions import VotifyDrmDisabledException
|
||||
from .exceptions import VotifyNoCdmException
|
||||
from .types import SpotifyMedia
|
||||
from .video import SpotifyVideoInterface
|
||||
|
||||
@@ -53,8 +53,6 @@ class SpotifyEpisodeVideoInterface(SpotifyVideoInterface):
|
||||
media.stream_info = await self.get_stream_info(episode_id, "episode")
|
||||
|
||||
if media.stream_info.audio_track.widevine_pssh:
|
||||
if self.no_drm:
|
||||
raise VotifyDrmDisabledException(media.media_id, episode_data)
|
||||
media.decryption_key = await self.get_widevine_decryption_key(
|
||||
media.stream_info.audio_track.widevine_pssh
|
||||
)
|
||||
|
||||
@@ -6,11 +6,10 @@ from InquirerPy import inquirer
|
||||
from InquirerPy.base.control import Choice
|
||||
|
||||
from .audio import SpotifyAudioInterface
|
||||
from .enums import AudioQuality, AutoMediaOption
|
||||
from .enums import AutoMediaOption
|
||||
from .episode import SpotifyEpisodeInterface
|
||||
from .episode_video import SpotifyEpisodeVideoInterface
|
||||
from .exceptions import (
|
||||
VotifyDrmDisabledException,
|
||||
VotifyMediaFlatFilterException,
|
||||
VotifyMediaNotFoundException,
|
||||
VotifyMediaUnstreamableException,
|
||||
@@ -48,9 +47,6 @@ class SpotifyInterface:
|
||||
album_data: dict | None = None,
|
||||
album_items: list[dict] | None = None,
|
||||
) -> SpotifyMedia | BaseException | None:
|
||||
if self.base.no_drm:
|
||||
return VotifyDrmDisabledException(track_id)
|
||||
|
||||
track_response = await self.base.api.get_track(track_id)
|
||||
track_data = track_response["data"]["trackUnion"]
|
||||
|
||||
@@ -146,10 +142,6 @@ class SpotifyInterface:
|
||||
self,
|
||||
media_id: str,
|
||||
) -> AsyncGenerator[SpotifyMedia | BaseException, None]:
|
||||
if self.base.no_drm:
|
||||
yield VotifyDrmDisabledException(media_id)
|
||||
return
|
||||
|
||||
album_data, album_items = await self.base.get_album_data_cached(
|
||||
album_id=media_id
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user