From bc2c054ce01c21b9673e8ba7b9b37625fe41cafd Mon Sep 17 00:00:00 2001 From: Gleb Liutsko Date: Wed, 20 Nov 2019 17:32:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=94?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20.rst=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=B3?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D0=B8=D0=B0=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=20artists=5Falbums=20=D0=BD=D0=B0=20artists=5Fdire?= =?UTF-8?q?ct=5Falbums?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/source/yandex_music.artist.artist_albums.rst | 7 +++++++ docs/source/yandex_music.artist.rst | 1 + yandex_music/artist/artist.py | 4 ++-- yandex_music/client.py | 8 ++++---- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 docs/source/yandex_music.artist.artist_albums.rst diff --git a/docs/source/yandex_music.artist.artist_albums.rst b/docs/source/yandex_music.artist.artist_albums.rst new file mode 100644 index 0000000..c734d47 --- /dev/null +++ b/docs/source/yandex_music.artist.artist_albums.rst @@ -0,0 +1,7 @@ +yandex_music.ArtistAlbums +========================= + +.. autoclass:: yandex_music.ArtistAlbums + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/yandex_music.artist.rst b/docs/source/yandex_music.artist.rst index 483b4be..63446e8 100644 --- a/docs/source/yandex_music.artist.rst +++ b/docs/source/yandex_music.artist.rst @@ -11,4 +11,5 @@ yandex_music.artist.description yandex_music.artist.brief_info yandex_music.artist.artist_tracks + yandex_music.artist.artist_albums yandex_music.artist.pager diff --git a/yandex_music/artist/artist.py b/yandex_music/artist/artist.py index 5e3b838..852cad2 100644 --- a/yandex_music/artist/artist.py +++ b/yandex_music/artist/artist.py @@ -98,9 +98,9 @@ class Artist(YandexMusicObject): def get_albums(self, page=0, page_size=20, sort_by='year', *args, **kwargs): """Сокращение для:: - client.artists_albums(artist.id, page, page_size, sort_by, *args, **kwargs) + client.artists_direct_albums(artist.id, page, page_size, sort_by, *args, **kwargs) """ - return self.client.artists_albums(self.id, page, page_size, sort_by, *args, **kwargs) + return self.client.artists_direct_albums(self.id, page, page_size, sort_by, *args, **kwargs) @classmethod def de_json(cls, data, client): diff --git a/yandex_music/client.py b/yandex_music/client.py index 88723a4..dbafcdb 100644 --- a/yandex_music/client.py +++ b/yandex_music/client.py @@ -922,7 +922,7 @@ class Client(YandexMusicObject): return ArtistTracks.de_json(result, self) @log - def artists_albums(self, artist_id: str or int, page=0, page_size=20, sort_by='year', timeout=None, *args, **kwargs): + def artists_direct_albums(self, artist_id: str or int, page=0, page_size=20, sort_by='year', timeout=None, *args, **kwargs): """Получение альбомов артиста. Args: @@ -936,7 +936,7 @@ class Client(YandexMusicObject): Returns: :obj:`yandex_music.ArtistAlbums`: Объекта класса :class:`yandex_music.ArtistsTracks` - представляющий страницу списка альбомов артиста + представляющий страницу списка альбомов артиста """ url = f'{self.base_url}/artists/{artist_id}/direct-albums' @@ -1171,8 +1171,8 @@ class Client(YandexMusicObject): artistsBriefInfo = artists_brief_info #: Псевдоним для :attr:`artists_tracks` artistsTracks = artists_tracks - #: Псевдоним для :attr:`artists_albums` - artistsAlbums = artists_albums + #: Псевдоним для :attr:`artists_direct_albums` + artistsDirectAlbums = artists_direct_albums #: Псевдоним для :attr:`users_likes_tracks_add` usersLikesTracksAdd = users_likes_tracks_add #: Псевдоним для :attr:`users_likes_tracks_remove`