Issues/#509 Новые поля

tests/conftest.py

@@ -250,7 +250,7 @@ def artist_decomposed(artist_without_nested_artist):
 
 
 @pytest.fixture(scope='session')
-def track_factory(major, normalization, user, meta_data, poetry_lover_match):
+def track_factory(major, normalization, user, meta_data, poetry_lover_match, r128_, lyrics_info):
     class TrackFactory:
         def get(self, artists, albums, track_without_nested_tracks=None):
             return Track(
@@ -292,6 +292,11 @@ def get(self, artists, albums, track_without_nested_tracks=None):
                 TestTrack.background_video_uri,
                 TestTrack.short_description,
                 TestTrack.is_suitable_for_children,
+                TestTrack.track_source,
+                TestTrack.available_for_options,
+                r128_,
+                lyrics_info,
+                TestTrack.track_sharing_flag,
             )
 
     return TrackFactory()

tests/test_track.py

@@ -36,6 +36,9 @@ class TestTrack:
         ' желания познакомиться с девушкой, достаточно много. Обычно они сводятся к опасениям,'
     )
     is_suitable_for_children = True
+    track_source = 'OWN'
+    available_for_options = ['bookmate']
+    track_sharing_flag = 'VIDEO_ALLOWED'
 
     def test_expected_values(
         self,
@@ -48,6 +51,8 @@ def test_expected_values(
         user,
         meta_data,
         poetry_lover_match,
+        r128_,
+        lyrics_info,
     ):
         assert track.id == self.id
         assert track.title == self.title
@@ -87,6 +92,11 @@ def test_expected_values(
         assert track.background_video_uri == self.background_video_uri
         assert track.short_description == self.short_description
         assert track.is_suitable_for_children == self.is_suitable_for_children
+        assert track.track_source == self.track_source
+        assert track.available_for_options == self.available_for_options
+        assert track.r128 == r128_
+        assert track.lyrics_info == lyrics_info
+        assert track.track_sharing_flag == self.track_sharing_flag
 
     def test_de_json_none(self, client):
         assert Track.de_json({}, client) is None
@@ -111,6 +121,8 @@ def test_de_json_all(
         user,
         meta_data,
         poetry_lover_match,
+        r128_,
+        lyrics_info,
     ):
         json_dict = {
             'id': self.id,
@@ -151,6 +163,11 @@ def test_de_json_all(
             'background_video_uri': self.background_video_uri,
             'short_description': self.short_description,
             'is_suitable_for_children': self.is_suitable_for_children,
+            'track_source': self.track_source,
+            'available_for_options': self.available_for_options,
+            'r128': r128_.to_dict(),
+            'lyrics_info': lyrics_info.to_dict(),
+            'track_sharing_flag': self.track_sharing_flag,
         }
         track = Track.de_json(json_dict, client)
 
@@ -192,6 +209,11 @@ def test_de_json_all(
         assert track.background_video_uri == self.background_video_uri
         assert track.short_description == self.short_description
         assert track.is_suitable_for_children == self.is_suitable_for_children
+        assert track.track_source == self.track_source
+        assert track.available_for_options == self.available_for_options
+        assert track.r128 == r128_
+        assert track.lyrics_info == lyrics_info
+        assert track.track_sharing_flag == self.track_sharing_flag
 
     def test_equality(self):
         a = Track(self.id)

yandex_music/track/track.py

@@ -17,6 +17,8 @@
         MetaData,
         PoetryLoverMatch,
         TrackLyrics,
+        LyricsInfo,
+        r128,
     )
 
 
@@ -29,6 +31,10 @@ class Track(YandexMusicObject):
 
         Известные значения поля `type`: `music`.
 
+        Известные значения поля `track_sharing_flag`: 'VIDEO_ALLOWED', 'COVER_ONLY'
+
+        Известные значения поля `available_for_options`: 'bookmate'
+
         Поля `can_publish`, `state`, `desired_visibility`, `filename`, `user_info` доступны только у треков что были
         загружены пользователем.
 
@@ -76,6 +82,12 @@ class Track(YandexMusicObject):
         background_video_uri (:obj:`str`, optional): Ссылка на видеошот.
         short_description (:obj:`str`, optional): Краткое опсание эпизода подкаста.
         is_suitable_for_children (:obj:`bool`, optional): Подходит ли для детей TODO.
+        track_source (:obj:`str`, optional): Источник трека.
+        available_for_options (:obj:`list` из :obj:`str`, optional): Возможные опции для трека.
+        r128 (:obj:`yandex_music.r128`, optional): Свойства трека.
+        lyrics_info (:obj:`yandex_music.LyricsInfo`, optional): Данные о наличии текстов трека.
+        track_sharing_flag (:obj:`str`, optional): TODO.
+
         client (:obj:`yandex_music.Client`): Клиент Yandex Music.
     """
 
@@ -117,6 +129,11 @@ class Track(YandexMusicObject):
     background_video_uri: Optional[str] = None
     short_description: Optional[str] = None
     is_suitable_for_children: Optional[bool] = None
+    track_source: Optional[str] = None
+    available_for_options: Optional[List[str]] = None
+    r128: Optional['r128'] = None
+    lyrics_info: Optional['LyricsInfo'] = None
+    track_sharing_flag: Optional[str] = None
     client: Optional['Client'] = None
 
     def __post_init__(self):
@@ -466,7 +483,7 @@ def de_json(cls, data: dict, client: 'Client') -> Optional['Track']:
             return None
 
         data = super(Track, cls).de_json(data, client)
-        from yandex_music import Normalization, Major, Album, Artist, User, MetaData, PoetryLoverMatch
+        from yandex_music import Normalization, Major, Album, Artist, User, MetaData, PoetryLoverMatch, r128, LyricsInfo
 
         data['albums'] = Album.de_list(data.get('albums'), client)
         data['artists'] = Artist.de_list(data.get('artists'), client)
@@ -477,6 +494,8 @@ def de_json(cls, data: dict, client: 'Client') -> Optional['Track']:
         data['user_info'] = User.de_json(data.get('user_info'), client)
         data['meta_data'] = MetaData.de_json(data.get('meta_data'), client)
         data['poetry_lover_matches'] = PoetryLoverMatch.de_list(data.get('poetry_lover_matches'), client)
+        data['r128'] = r128.de_json(data.get('r128'), client)
+        data['lyrics_info'] = LyricsInfo.de_json(data.get('lyrics_info'), client)
 
         return cls(client=client, **data)