diff --git a/yandex_music/base.py b/yandex_music/base.py index 62c4a46..7d62b16 100644 --- a/yandex_music/base.py +++ b/yandex_music/base.py @@ -3,7 +3,7 @@ import json from abc import ABCMeta -class YandexMusicObject(object): +class YandexMusicObject: __metaclass__ = ABCMeta _id_attrs = () diff --git a/yandex_music/client.py b/yandex_music/client.py index fc946a4..3403cfa 100644 --- a/yandex_music/client.py +++ b/yandex_music/client.py @@ -915,32 +915,20 @@ class Client(YandexMusicObject): fromToken = from_token """Псевдоним для :attr:`generate_token_by_username_and_password`""" generateTokenByUsernameAndPassword = generate_token_by_username_and_password - """Псевдоним для :attr:`request`""" - request = request """Псевдоним для :attr:`account_status`""" accountStatus = account_status - """Псевдоним для :attr:`settings`""" - settings = settings """Псевдоним для :attr:`permission_alerts`""" permissionAlerts = permission_alerts """Псевдоним для :attr:`account_experiments`""" accountExperiments = account_experiments """Псевдоним для :attr:`consume_promo_code`""" consumePromoCode = consume_promo_code - """Псевдоним для :attr:`feed`""" - feed = feed """Псевдоним для :attr:`feed_wizard_is_passed`""" feedWizardIsPassed = feed_wizard_is_passed - """Псевдоним для :attr:`landing`""" - landing = landing - """Псевдоним для :attr:`genres`""" - genres = genres """Псевдоним для :attr:`tracks_download_info`""" tracksDownloadInfo = tracks_download_info """Псевдоним для :attr:`play_audio`""" playAudio = play_audio - """Псевдоним для :attr:`search`""" - search = search """Псевдоним для :attr:`search_suggest`""" searchSuggest = search_suggest """Псевдоним для :attr:`users_playlists`""" @@ -989,12 +977,6 @@ class Client(YandexMusicObject): usersLikesAlbumsAdd = users_likes_albums_add """Псевдоним для :attr:`users_likes_albums_remove`""" usersLikesAlbumsRemove = users_likes_albums_remove - """Псевдоним для :attr:`artists`""" - artists = artists - """Псевдоним для :attr:`albums`""" - albums = albums - """Псевдоним для :attr:`tracks`""" - tracks = tracks """Псевдоним для :attr:`playlists_list`""" playlistsList = playlists_list """Псевдоним для :attr:`users_playlists_list`""" diff --git a/yandex_music/download_info.py b/yandex_music/download_info.py index f2e07c1..af0d0f6 100644 --- a/yandex_music/download_info.py +++ b/yandex_music/download_info.py @@ -131,3 +131,8 @@ class DownloadInfo(YandexMusicObject): info.get_direct_link() return downloads_info + + # camelCase псевдонимы + + """Псевдоним для :attr:`get_direct_link`""" + getDirectLink = get_direct_link diff --git a/yandex_music/landing/block_entity.py b/yandex_music/landing/block_entity.py index f4bd85e..13fe917 100644 --- a/yandex_music/landing/block_entity.py +++ b/yandex_music/landing/block_entity.py @@ -1,4 +1,5 @@ -from yandex_music import YandexMusicObject, Promotion, Album, Playlist, MixLink, PlayContext, ChartItem, GeneratedPlaylist +from yandex_music import YandexMusicObject, Promotion, Album, Playlist, MixLink, PlayContext, ChartItem,\ + GeneratedPlaylist de_json = { diff --git a/yandex_music/landing/mix_link.py b/yandex_music/landing/mix_link.py index 52674f1..2fdfc4d 100644 --- a/yandex_music/landing/mix_link.py +++ b/yandex_music/landing/mix_link.py @@ -21,6 +21,7 @@ class MixLink(YandexMusicObject): self.cover_white = cover_white self.client = client + self._id_attrs = (self.url, ) @classmethod def de_json(cls, data, client): diff --git a/yandex_music/landing/promotion.py b/yandex_music/landing/promotion.py index 331c17c..235dacb 100644 --- a/yandex_music/landing/promotion.py +++ b/yandex_music/landing/promotion.py @@ -25,6 +25,7 @@ class Promotion(YandexMusicObject): self.image = image self.client = client + self._id_attrs = (self.promo_id, ) @classmethod def de_json(cls, data, client): diff --git a/yandex_music/playlist/playlist.py b/yandex_music/playlist/playlist.py index 4ae78c5..a337334 100644 --- a/yandex_music/playlist/playlist.py +++ b/yandex_music/playlist/playlist.py @@ -111,3 +111,10 @@ class Playlist(YandexMusicObject): playlists.append(cls.de_json(playlist, client)) return playlists + + # camelCase псевдонимы + + """Псевдоним для :attr:`is_mine`""" + isMine = is_mine + """Псевдоним для :attr:`playlist_id`""" + playlistId = playlist_id diff --git a/yandex_music/rotor/value.py b/yandex_music/rotor/value.py index 709959c..63cbb4e 100644 --- a/yandex_music/rotor/value.py +++ b/yandex_music/rotor/value.py @@ -31,4 +31,3 @@ class Value(YandexMusicObject): values.append(cls.de_json(value, client)) return values - diff --git a/yandex_music/track/track.py b/yandex_music/track/track.py index 1ea1f56..e17b2f1 100644 --- a/yandex_music/track/track.py +++ b/yandex_music/track/track.py @@ -98,3 +98,12 @@ class Track(YandexMusicObject): tracks.append(cls.de_json(track, client)) return tracks + + # camelCase псевдонимы + + """Псевдоним для :attr:`get_download_info`""" + getDownloadInfo = get_download_info + """Псевдоним для :attr:`download_cover`""" + downloadCover = download_cover + """Псевдоним для :attr:`track_id`""" + trackId = track_id diff --git a/yandex_music/track_short.py b/yandex_music/track_short.py index 1c28054..de184b2 100644 --- a/yandex_music/track_short.py +++ b/yandex_music/track_short.py @@ -95,3 +95,8 @@ class TrackShort(YandexMusicObject): tracks.append(cls.de_json(track, client)) return tracks + + # camelCase псевдонимы + + """Псевдоним для :attr:`track_id`""" + trackId = track_id diff --git a/yandex_music/tracks_list.py b/yandex_music/tracks_list.py index 9429179..4ccb4e0 100644 --- a/yandex_music/tracks_list.py +++ b/yandex_music/tracks_list.py @@ -63,3 +63,8 @@ class TracksList(YandexMusicObject): data['tracks'] = TrackShort.de_list(data.get('tracks'), client) return cls(client=client, **data) + + # camelCase псевдонимы + + """Псевдоним для :attr:`tracks_ids`""" + tracksIds = tracks_ids diff --git a/yandex_music/utils/difference.py b/yandex_music/utils/difference.py index c31baf6..db423c1 100644 --- a/yandex_music/utils/difference.py +++ b/yandex_music/utils/difference.py @@ -8,7 +8,7 @@ class Operation(Enum): DELETE = 'delete' -class Difference(object): +class Difference: def __init__(self): self.operations = [] diff --git a/yandex_music/utils/request.py b/yandex_music/utils/request.py index 9b7055e..1268b19 100644 --- a/yandex_music/utils/request.py +++ b/yandex_music/utils/request.py @@ -17,7 +17,7 @@ HEADERS = { } -class Request(object): +class Request: """ Вспомогателньный класс для yandex_music предоставляющий методы для выполнения POST и GET запросов, скачивания файлов.