From db915589c32f4c2940aa33586e29d428da7069db Mon Sep 17 00:00:00 2001 From: Lev Plyusnin Date: Mon, 3 Feb 2025 19:56:36 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20yan?= =?UTF-8?q?dex-music-api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- ymd/core.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9a328e4..d27a67c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "yandex-music-downloader" -version = "3.4.3b1" +version = "3.4.3b2" description = "Загрузчик музыки с сервиса Яндекс.Музыка" requires-python = ">=3.9" readme = "README.md" diff --git a/ymd/core.py b/ymd/core.py index b5f5033..572f37b 100644 --- a/ymd/core.py +++ b/ymd/core.py @@ -26,7 +26,12 @@ from mutagen.id3._specs import ID3TimeStamp, PictureType from mutagen.mp3 import MP3 from mutagen.mp4 import MP4, MP4Cover from strenum import LowercaseStrEnum -from yandex_music import Client, DownloadInfo, Track, YandexMusicObject +from yandex_music import ( + Client, + DownloadInfo, + Track, + YandexMusicModel, +) from ymd.api import get_lossless_info from ymd.mime_utils import MimeType, guess_mime_type @@ -71,7 +76,7 @@ def init_client(token: str, timeout: int) -> Client: return client.init() -def full_title(obj: YandexMusicObject) -> Optional[str]: +def full_title(obj: YandexMusicModel) -> Optional[str]: result = obj["title"] if result is None: return @@ -249,7 +254,7 @@ def download_track( covers_cache = typing.cast(dict[int, AlbumCover], covers_cache) target_path = track_info.path track = track_info.track - client = track.client + client = typing.cast(Client, track.client) assert client album = track.albums[0] @@ -262,7 +267,7 @@ def download_track( ): download_via_temporary_file(client, track_lyrics.download_url, lrc_path) elif lyrics_info.has_available_text_lyrics: - if track_lyrics := track.get_lyrics(format="TEXT"): + if track_lyrics := track.get_lyrics(format_="TEXT"): text_lyrics = track_lyrics.fetch_lyrics() cover = None