From b271d5fedbe31a1e58a62381d7ceae58a6d49063 Mon Sep 17 00:00:00 2001 From: Rafael Moraes <50295204+glomatico@users.noreply.github.com> Date: Sun, 22 Mar 2026 16:14:01 -0300 Subject: [PATCH] Use VotifyNoCdmException; remove no_drm guards --- votify/interface/episode_video.py | 4 +--- votify/interface/interface.py | 10 +--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/votify/interface/episode_video.py b/votify/interface/episode_video.py index 95fc37f..3669c38 100644 --- a/votify/interface/episode_video.py +++ b/votify/interface/episode_video.py @@ -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 ) diff --git a/votify/interface/interface.py b/votify/interface/interface.py index bcf6e64..8c82aca 100644 --- a/votify/interface/interface.py +++ b/votify/interface/interface.py @@ -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 )