From c650464a0716c1d2e6aa2cad227eb88b809069f3 Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Mon, 15 Mar 2021 14:37:07 -0700 Subject: [PATCH] Removed process_media because of circular import --- qobuz_dl_rewrite/converter.py | 12 ------------ qobuz_dl_rewrite/downloader.py | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/qobuz_dl_rewrite/converter.py b/qobuz_dl_rewrite/converter.py index 4ad7742..2713bf5 100644 --- a/qobuz_dl_rewrite/converter.py +++ b/qobuz_dl_rewrite/converter.py @@ -5,7 +5,6 @@ import subprocess from tempfile import gettempdir from typing import Optional -from .downloader import Track, Tracklist from .exceptions import ConversionError logger = logging.getLogger(__name__) @@ -84,17 +83,6 @@ class Converter: else: raise ConversionError("No file was returned from conversion") - def process_media(self, media_obj): - if isinstance(media_obj, Track): - self.convert(media_obj.final_path) - elif isinstance(media_obj, Tracklist): - for media in media_obj: - self.process_media(media) - else: - raise TypeError( - f"Media must be Track, Album, Playlist, or Artist, not {type(media_obj)}" - ) - def _gen_command(self): command = [ "ffmpeg", diff --git a/qobuz_dl_rewrite/downloader.py b/qobuz_dl_rewrite/downloader.py index 7b231b1..a4a8c81 100644 --- a/qobuz_dl_rewrite/downloader.py +++ b/qobuz_dl_rewrite/downloader.py @@ -221,7 +221,7 @@ class Track: self.__is_tagged = True def convert(self, codec="ALAC", **kwargs): - assert self.__is_downloaded, "track must be downloaded before conversion" + assert self.__is_downloaded, "Track must be downloaded before conversion" CONV_CLASS = { "FLAC": converter.FLAC,