Добавлен тип Notification для сообщения ленты

K1llMan · Jan 29, 2023 · 0d78826 · 0d78826
1 parent 450cf41
commit 0d78826
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 75 deletions.
diff --git a/src/Yandex.Music.Api/Common/Debug/DebugSettings.cs b/src/Yandex.Music.Api/Common/Debug/DebugSettings.cs
@@ -28,11 +28,14 @@ public T Deserialize<T>(string url, string json, JsonSerializerSettings settings
         {
             Dictionary<string, List<string>> errors = new();
 
-            settings.Error = (sender, args) =>
-            {
+            settings.Error = (sender, args) => {
                 int pos = args.ErrorContext.Error.Message.IndexOf("Path", StringComparison.Ordinal);
-                string error = args.ErrorContext.Error.Message.Substring(0, pos);
-                string path = args.ErrorContext.Error.Message.Substring(pos);
+                string error = pos  > 0 
+                    ? args.ErrorContext.Error.Message.Substring(0, pos)
+                    : args.ErrorContext.Error.Message;
+                string path = pos > 0 
+                    ? args.ErrorContext.Error.Message.Substring(pos) 
+                    : args.ErrorContext.Path;
 
                 if (!errors.ContainsKey(error))
                     errors[error] = new List<string>();

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEvent.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEvent.cs
@@ -9,79 +9,77 @@ namespace Yandex.Music.Api.Models.Feed.Event
 {
     public sealed class YFeedEventConverter : JsonConverter
     {
-        private YFeedEvent GetEvent(JToken jObject)
+        private YFeedEventTitled GetEvent(JToken jObject)
         {
-            YFeedEvent feedEvent;
+            YFeedEventTitled feedEvent;
 
-            try
-            {
-                YFeedEventType type = jObject["typeForFrom"].ToObject<YFeedEventType>();
-
-                switch (type)
-                {
-                    case YFeedEventType.GenreTop:
-                        feedEvent = jObject.ToObject<YFeedEventGenreTracksTop>();
-                        break;
-
-                    case YFeedEventType.NewAlbums:
-                        feedEvent = jObject.ToObject<YFeedEventAlbums>();
-                        break;
-
-                    case YFeedEventType.NewAlbumsOfFavoriteGenre:
-                        feedEvent = jObject.ToObject<YFeedEventGenreAlbums>();
-                        break;
-
-                    case YFeedEventType.RecentTrackLikeToTracks:
-                        feedEvent = jObject.ToObject<YFeedEventLikeTrack>();
-                        break;
-
-                    case YFeedEventType.RecommendedArtistsWithArtistsFromHistory:
-                        feedEvent = jObject.ToObject<YFeedEventArtistWithArtists>();
-                        break;
-
-                    case YFeedEventType.RecommendedSimilarArtists:
-                        feedEvent = jObject.ToObject<YFeedEventSimilarArtists>();
-                        break;
-
-                    case YFeedEventType.RecommendedSimilarGenre:
-                        feedEvent = jObject.ToObject<YFeedEventSimilarGenre>();
-                        break;
-
-                    case YFeedEventType.MissedTracksByArtist:
-                    case YFeedEventType.RareArtist:
-                    case YFeedEventType.RecommendedTracksByArtistFromHistory:
-                        feedEvent = jObject.ToObject<YFeedEventArtist>();
-                        break;
-
-                    case YFeedEventType.NewTracksOfFavoriteGenre:
-                    case YFeedEventType.TracksByGenre:
-                        feedEvent = jObject.ToObject<YFeedEventGenreTracks>();
-                        break;
-
-                    case YFeedEventType.WellForgottenOldArtists:
-                        feedEvent = jObject.ToObject<YFeedEventArtists>();
-                        break;
-
-                    case YFeedEventType.WellForgottenOldTracks:
-                        feedEvent = jObject.ToObject<YFeedEventTracks>();
-                        break;
-
-                    default:
-                        feedEvent = jObject.ToObject<YFeedEvent>();
-                        break;
-                }
-            }
-            catch (Exception ex)
+            YFeedEventType type = jObject[jObject["typeForFrom"] != null ? "typeForFrom" : "type"]
+                .ToObject<YFeedEventType>();
+
+            switch (type)
             {
-                throw new Exception($"Ошибка десериализации типа \"{jObject["typeForFrom"]}\".", ex);
+                case YFeedEventType.GenreTop:
+                    feedEvent = jObject.ToObject<YFeedEventGenreTracksTop>();
+                    break;
+
+                case YFeedEventType.NewAlbums:
+                    feedEvent = jObject.ToObject<YFeedEventAlbums>();
+                    break;
+
+                case YFeedEventType.NewAlbumsOfFavoriteGenre:
+                    feedEvent = jObject.ToObject<YFeedEventGenreAlbums>();
+                    break;
+
+                case YFeedEventType.Notification:
+                    feedEvent = jObject.ToObject<YFeedEventNotification>();
+                    break;
+
+                case YFeedEventType.RecentTrackLikeToTracks:
+                    feedEvent = jObject.ToObject<YFeedEventLikeTrack>();
+                    break;
+
+                case YFeedEventType.RecommendedArtistsWithArtistsFromHistory:
+                    feedEvent = jObject.ToObject<YFeedEventArtistWithArtists>();
+                    break;
+
+                case YFeedEventType.RecommendedSimilarArtists:
+                    feedEvent = jObject.ToObject<YFeedEventSimilarArtists>();
+                    break;
+
+                case YFeedEventType.RecommendedSimilarGenre:
+                    feedEvent = jObject.ToObject<YFeedEventSimilarGenre>();
+                    break;
+
+                case YFeedEventType.MissedTracksByArtist:
+                case YFeedEventType.RareArtist:
+                case YFeedEventType.RecommendedTracksByArtistFromHistory:
+                    feedEvent = jObject.ToObject<YFeedEventArtist>();
+                    break;
+
+                case YFeedEventType.NewTracksOfFavoriteGenre:
+                case YFeedEventType.TracksByGenre:
+                    feedEvent = jObject.ToObject<YFeedEventGenreTracks>();
+                    break;
+
+                case YFeedEventType.WellForgottenOldArtists:
+                    feedEvent = jObject.ToObject<YFeedEventArtists>();
+                    break;
+
+                case YFeedEventType.WellForgottenOldTracks:
+                    feedEvent = jObject.ToObject<YFeedEventTracks>();
+                    break;
+
+                default:
+                    feedEvent = jObject.ToObject<YFeedEventTitled>();
+                    break;
             }
 
             return feedEvent;
         }
 
         public override bool CanConvert(Type objectType)
         {
-            return typeof(YFeedEvent).IsAssignableFrom(objectType);
+            return typeof(YFeedEventTitled).IsAssignableFrom(objectType);
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -103,8 +101,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
     public class YFeedEvent
     {
         public string Id { get; set; }
-        public List<YFeedEventTitle> Title { get; set; }
-        public YFeedEventType TypeForFrom { get; set; }
         public YFeedEventType Type { get; set; }
     }
 }
diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventAlbums.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventAlbums.cs
@@ -4,7 +4,7 @@
 
 namespace Yandex.Music.Api.Models.Feed.Event
 {
-    public class YFeedEventAlbums: YFeedEvent
+    public class YFeedEventAlbums: YFeedEventTitled
     {
         public List<YAlbum> Albums { get; set; }
     }

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventArtistWithArtists.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventArtistWithArtists.cs
@@ -2,7 +2,7 @@
 
 namespace Yandex.Music.Api.Models.Feed.Event
 {
-    public class YFeedEventArtistWithArtists: YFeedEvent
+    public class YFeedEventArtistWithArtists: YFeedEventTitled
     {
         public List<YArtistsFromHistory> ArtistsWithArtistsFromHistory { get; set; }
     }

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventArtists.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventArtists.cs
@@ -4,7 +4,7 @@
 
 namespace Yandex.Music.Api.Models.Feed.Event
 {
-    public class YFeedEventArtists: YFeedEvent
+    public class YFeedEventArtists: YFeedEventTitled
     {
         public List<YArtist> Artists { get; set; }
     }

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventNotification.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventNotification.cs
@@ -0,0 +1,7 @@
+namespace Yandex.Music.Api.Models.Feed.Event
+{
+    public class YFeedEventNotification : YFeedEventTitled
+    {
+        public string Message { get; set; }
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventSimilarArtists.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventSimilarArtists.cs
@@ -4,7 +4,7 @@
 
 namespace Yandex.Music.Api.Models.Feed.Event
 {
-    public class YFeedEventSimilarArtists: YFeedEvent
+    public class YFeedEventSimilarArtists: YFeedEventTitled
     {
         public YArtist SimilarToArtist { get; set; }
         public List<YArtist> SimilarArtists { get; set; }

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventTitled.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventTitled.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Yandex.Music.Api.Models.Feed.Event
+{
+    public class YFeedEventTitled: YFeedEvent
+    {
+        public List<YFeedEventTitle> Title { get; set; }
+        public YFeedEventType TypeForFrom { get; set; }
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventTracks.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventTracks.cs
@@ -4,7 +4,7 @@
 
 namespace Yandex.Music.Api.Models.Feed.Event
 {
-    public class YFeedEventTracks: YFeedEvent
+    public class YFeedEventTracks: YFeedEventTitled
     {
         public List<YTrack> Tracks { get; set; }
     }

diff --git a/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventType.cs b/src/Yandex.Music.Api/Models/Feed/Event/YFeedEventType.cs
@@ -19,6 +19,8 @@ public enum YFeedEventType
         [EnumMember(Value = "new-tracks-of-favorite-genre")]
         NewTracksOfFavoriteGenre,
 
+        Notification,
+
         [EnumMember(Value = "rare-artist")]
         RareArtist,
 

diff --git a/src/Yandex.Music.Api/Models/Feed/YFeedDay.cs b/src/Yandex.Music.Api/Models/Feed/YFeedDay.cs
@@ -11,7 +11,7 @@ public class YFeedDay
     {
         public DateTime Day { get; set; }
         [JsonConverter(typeof(YFeedEventConverter))]
-        public List<YFeedEvent> Events { get; set; }
+        public List<YFeedEventTitled> Events { get; set; }
         public List<YTrack> TracksToPlay { get; set; }
         public List<YFeedDayTrackWithAds> TracksToPlayWithAds { get; set; }
     }