From 119a337623c2a124219dfc1325967841b56f3c69 Mon Sep 17 00:00:00 2001 From: "Ilya (Marshal)" Date: Wed, 11 Jan 2023 10:50:33 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B5=20cover=5Fwhite=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20MixLink=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20optional.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_mix_link.py | 6 ------ yandex_music/landing/mix_link.py | 10 +++++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/test_mix_link.py b/tests/test_mix_link.py index 94754cb..6fcd821 100644 --- a/tests/test_mix_link.py +++ b/tests/test_mix_link.py @@ -37,7 +37,6 @@ class TestMixLink: 'text_color': self.text_color, 'background_color': self.background_color, 'background_image_uri': self.background_image_uri, - 'cover_white': self.cover_white, } mix_link = MixLink.de_json(json_dict, client) @@ -47,7 +46,6 @@ class TestMixLink: assert mix_link.text_color == self.text_color assert mix_link.background_color == self.background_color assert mix_link.background_image_uri == self.background_image_uri - assert mix_link.cover_white == self.cover_white def test_de_json_all(self, client): json_dict = { @@ -79,7 +77,6 @@ class TestMixLink: self.text_color, self.background_color, self.background_image_uri, - self.cover_white, ) b = MixLink( self.title, @@ -88,7 +85,6 @@ class TestMixLink: self.text_color, self.background_color, self.background_image_uri, - self.cover_white, ) c = MixLink( self.title, @@ -97,7 +93,6 @@ class TestMixLink: '#000000', self.background_color, self.background_image_uri, - self.cover_white, ) d = MixLink( self.title, @@ -106,7 +101,6 @@ class TestMixLink: self.text_color, self.background_color, self.background_image_uri, - self.cover_white, ) assert a != b != c diff --git a/yandex_music/landing/mix_link.py b/yandex_music/landing/mix_link.py index 94ba932..a86e3a0 100644 --- a/yandex_music/landing/mix_link.py +++ b/yandex_music/landing/mix_link.py @@ -1,6 +1,7 @@ from typing import TYPE_CHECKING, Optional, List from yandex_music import YandexMusicObject +from yandex_music.exceptions import YandexMusicError from yandex_music.utils import model if TYPE_CHECKING: @@ -23,7 +24,7 @@ class MixLink(YandexMusicObject): text_color (:obj:`str`): Цвет текста (HEX). background_color (:obj:`str`): Цвет заднего фона. background_image_uri (:obj:`str`): Ссылка на изображение заднего фона. - cover_white (:obj:`str`): Ссылка на изображение с обложкой TODO. + cover_white (:obj:`str`, optional): Ссылка на изображение с обложкой TODO. cover_uri (:obj:`str`, optional): Ссылка на изображение с обложкой. client (:obj:`yandex_music.Client`, optional): Клиент Yandex Music. """ @@ -34,7 +35,7 @@ class MixLink(YandexMusicObject): text_color: str background_color: str background_image_uri: str - cover_white: str + cover_white: Optional[str] = None cover_uri: Optional[str] = None client: Optional['Client'] = None @@ -46,7 +47,6 @@ class MixLink(YandexMusicObject): self.text_color, self.background_color, self.background_image_uri, - self.cover_white, ) def get_cover_url(self, size: str = '200x200') -> str: @@ -69,6 +69,10 @@ class MixLink(YandexMusicObject): Returns: :obj:`str`: URL обложки. """ + + if not self.cover_white: + raise YandexMusicError('You can\'t get cover white because it\'s None.') + return f'https://{self.cover_white.replace("%%", size)}' def get_background_url(self, size: str = '200x200') -> str: