Исправления для новой версии yandex-music-api
This commit is contained in:
parent
db5688a024
commit
db915589c3
2 changed files with 10 additions and 5 deletions
|
|
@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "yandex-music-downloader"
|
name = "yandex-music-downloader"
|
||||||
version = "3.4.3b1"
|
version = "3.4.3b2"
|
||||||
description = "Загрузчик музыки с сервиса Яндекс.Музыка"
|
description = "Загрузчик музыки с сервиса Яндекс.Музыка"
|
||||||
requires-python = ">=3.9"
|
requires-python = ">=3.9"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|
|
||||||
13
ymd/core.py
13
ymd/core.py
|
|
@ -26,7 +26,12 @@ from mutagen.id3._specs import ID3TimeStamp, PictureType
|
||||||
from mutagen.mp3 import MP3
|
from mutagen.mp3 import MP3
|
||||||
from mutagen.mp4 import MP4, MP4Cover
|
from mutagen.mp4 import MP4, MP4Cover
|
||||||
from strenum import LowercaseStrEnum
|
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.api import get_lossless_info
|
||||||
from ymd.mime_utils import MimeType, guess_mime_type
|
from ymd.mime_utils import MimeType, guess_mime_type
|
||||||
|
|
@ -71,7 +76,7 @@ def init_client(token: str, timeout: int) -> Client:
|
||||||
return client.init()
|
return client.init()
|
||||||
|
|
||||||
|
|
||||||
def full_title(obj: YandexMusicObject) -> Optional[str]:
|
def full_title(obj: YandexMusicModel) -> Optional[str]:
|
||||||
result = obj["title"]
|
result = obj["title"]
|
||||||
if result is None:
|
if result is None:
|
||||||
return
|
return
|
||||||
|
|
@ -249,7 +254,7 @@ def download_track(
|
||||||
covers_cache = typing.cast(dict[int, AlbumCover], covers_cache)
|
covers_cache = typing.cast(dict[int, AlbumCover], covers_cache)
|
||||||
target_path = track_info.path
|
target_path = track_info.path
|
||||||
track = track_info.track
|
track = track_info.track
|
||||||
client = track.client
|
client = typing.cast(Client, track.client)
|
||||||
assert client
|
assert client
|
||||||
album = track.albums[0]
|
album = track.albums[0]
|
||||||
|
|
||||||
|
|
@ -262,7 +267,7 @@ def download_track(
|
||||||
):
|
):
|
||||||
download_via_temporary_file(client, track_lyrics.download_url, lrc_path)
|
download_via_temporary_file(client, track_lyrics.download_url, lrc_path)
|
||||||
elif lyrics_info.has_available_text_lyrics:
|
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()
|
text_lyrics = track_lyrics.fetch_lyrics()
|
||||||
|
|
||||||
cover = None
|
cover = None
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue