Обновлены модели, добавлен метод для плейлиста "Большая перемотка"

K1llMan · Oct 24, 2020 · 98fdeb2 · 98fdeb2
1 parent eb0589a
commit 98fdeb2
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 7 deletions.
diff --git a/Yandex.Music.Api.Tests/Tests/API/PlaylistAPITest.cs b/Yandex.Music.Api.Tests/Tests/API/PlaylistAPITest.cs
@@ -104,6 +104,15 @@ public void Podcasts_ValidData_True()
 
         [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
         [Order(8)]
+        public void Rewind_ValidData_True()
+        {
+            YResponse<YPlaylist> response = Fixture.API.Playlist.Rewind(Fixture.Storage);
+
+            response.Should().NotBeNull();
+        }
+
+        [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
+        [Order(9)]
         public void Create_ValidData_True()
         {
             Fixture.CreatedPlaylist = Fixture.API.Playlist.Create(Fixture.Storage, "Test Playlist").Result;
@@ -112,7 +121,7 @@ public void Create_ValidData_True()
         }
 
         [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
-        [Order(9)]
+        [Order(10)]
         public void InsertTrack_ValidData_True()
         {
             Fixture.CreatedPlaylist.Should().NotBeNull();
@@ -124,7 +133,7 @@ public void InsertTrack_ValidData_True()
         }
 
         [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
-        [Order(10)]
+        [Order(11)]
         public void DeleteTrack_ValidData_True()
         {
             Fixture.CreatedPlaylist.Should().NotBeNull();
@@ -136,7 +145,7 @@ public void DeleteTrack_ValidData_True()
         }
 
         [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
-        [Order(11)]
+        [Order(12)]
         public void Rename_ValidData_True()
         {
             Fixture.CreatedPlaylist.Should().NotBeNull();
@@ -147,7 +156,7 @@ public void Rename_ValidData_True()
         }
 
         [Fact, YandexTrait(TraitGroup.PlaylistAPI)]
-        [Order(12)]
+        [Order(13)]
         public void Remove_ValidData_True()
         {
             Fixture.CreatedPlaylist.Should().NotBeNull();

diff --git a/Yandex.Music.Api/API/YPlaylistAPI.cs b/Yandex.Music.Api/API/YPlaylistAPI.cs
@@ -240,6 +240,26 @@ public YResponse<YPlaylist> Podcasts(AuthStorage storage)
             return PodcastsAsync(storage).GetAwaiter().GetResult();
         }
 
+        /// <summary>
+        /// Большая перемотка
+        /// </summary>
+        /// <param name="storage">Хранилище</param>
+        /// <returns></returns>
+        public async Task<YResponse<YPlaylist>> RewindAsync(AuthStorage storage)
+        {
+            return await GetPersonalPlaylist(storage, YGeneratedPlaylistType.Rewind10);
+        }
+
+        /// <summary>
+        /// Большая перемотка
+        /// </summary>
+        /// <param name="storage">Хранилище</param>
+        /// <returns></returns>
+        public YResponse<YPlaylist> Rewind(AuthStorage storage)
+        {
+            return RewindAsync(storage).GetAwaiter().GetResult();
+        }
+
         #endregion Стандартные плейлисты
 
         #region Получение плейлиста

diff --git a/Yandex.Music.Api/Models/Account/YAccountResult.cs b/Yandex.Music.Api/Models/Account/YAccountResult.cs
@@ -1,4 +1,6 @@
-using Yandex.Music.Api.Models.Common;
+using Newtonsoft.Json;
+
+using Yandex.Music.Api.Models.Common;
 
 namespace Yandex.Music.Api.Models.Account
 {
@@ -13,6 +15,12 @@ public class YAccountResult
         public bool SubEditor { get; set; }
         public int SubEditorLevel { get; set; }
         public YSubscription Subscription { get; set; }
+        public YBar BarBelow { get; set; }
+        // Повторяющееся свойство с другим названием
+        [JsonProperty("bar-below")]
+        private YBar BarBelow2 {
+            set => BarBelow = value;
+        }
 
         #endregion
     }

diff --git a/Yandex.Music.Api/Models/Account/YBar.cs b/Yandex.Music.Api/Models/Account/YBar.cs
@@ -0,0 +1,13 @@
+namespace Yandex.Music.Api.Models.Account
+{
+    public class YBar
+    {
+        public string AlertId { get; set; }
+        public string Text { get; set; }
+        public string BgColor { get; set; }
+        public string TextColor { get; set; }
+        public string AlertType { get; set; }
+        public YButton Button { get; set; }
+        public bool CloseButton { get; set; }
+    }
+}
diff --git a/Yandex.Music.Api/Models/Account/YButton.cs b/Yandex.Music.Api/Models/Account/YButton.cs
@@ -0,0 +1,10 @@
+namespace Yandex.Music.Api.Models.Account
+{
+    public class YButton
+    {
+        public string Text { get; set; }
+        public string BgColor { get; set; }
+        public string TextColor { get; set; }
+        public string Uri { get; set; }
+    }
+}
diff --git a/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs b/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs
@@ -32,6 +32,11 @@ public enum YGeneratedPlaylistType
         /// <summary>
         /// Подкасты
         /// </summary>
-        Podcasts
+        Podcasts,
+
+        /// <summary>
+        /// Большая перемотка
+        /// </summary>
+        Rewind10
     }
 }
diff --git a/Yandex.Music.Api/Models/Radio/YStation.cs b/Yandex.Music.Api/Models/Radio/YStation.cs
@@ -10,6 +10,8 @@ public class YStation : YBaseModel
         public YStationData Data { get; set; }
         public string Explanation { get; set; }
         public List<YPrerolls> Prerolls { get; set; }
+        public string RupTitle { get; set; }
+        public string RupDescription { get; set; }
         public YStationSettings Settings { get; set; }
         public YStationSettings2 Settings2 { get; set; }
         public YStationDescription Station { get; set; }

diff --git a/Yandex.Music.Api/Models/Search/Playlist/YSearchPlaylistModel.cs b/Yandex.Music.Api/Models/Search/Playlist/YSearchPlaylistModel.cs
@@ -9,9 +9,10 @@ namespace Yandex.Music.Api.Models.Search.Playlist
 {
     public class YSearchPlaylistModel
     {
+        public bool Available { get; set; }
         [JsonConverter(typeof(YCoverConverter))]
         public YCover Cover { get; set; }
-
+        public string CoverUri { get; set; }
         public string Description { get; set; }
         public string DescriptionFormatted { get; set; }
         public string Kind { get; set; }

diff --git a/Yandex.Music.Api/Models/Search/Track/YSearchTrackModel.cs b/Yandex.Music.Api/Models/Search/Track/YSearchTrackModel.cs
@@ -15,6 +15,7 @@ public class YSearchTrackModel
         public bool AvailableAsRbt { get; set; }
         public bool AvailableForPremiumUsers { get; set; }
         public string ContentWarning { get; set; }
+        public string CoverUri { get; set; }
         public long DurationMs { get; set; }
         public bool Explicit { get; set; }
         public string Id { get; set; }