Обнновлено до .net10
This commit is contained in:
@@ -1,68 +1,11 @@
|
||||
namespace YandexMusic.API.Models.Pins.Items
|
||||
namespace YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
public abstract class YPin
|
||||
{
|
||||
public sealed class YPinConverter : JsonConverter
|
||||
{
|
||||
private YPin GetEvent(JToken jObject)
|
||||
{
|
||||
YPin pin;
|
||||
public YPinType Type { get; set; }
|
||||
}
|
||||
|
||||
YPinType type = jObject["type"]
|
||||
.ToObject<YPinType>();
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case YPinType.Album:
|
||||
pin = jObject.ToObject<YPin<YPinAlbumData>>();
|
||||
break;
|
||||
|
||||
case YPinType.Artist:
|
||||
pin = jObject.ToObject<YPin<YPinArtistData>>();
|
||||
break;
|
||||
|
||||
case YPinType.Playlist:
|
||||
pin = jObject.ToObject<YPin<YPinPlaylistData>>();
|
||||
break;
|
||||
|
||||
case YPinType.Wave:
|
||||
pin = jObject.ToObject<YPin<YPinWaveData>>();
|
||||
break;
|
||||
|
||||
default:
|
||||
pin = jObject.ToObject<YPin>();
|
||||
break;
|
||||
}
|
||||
|
||||
return pin;
|
||||
}
|
||||
|
||||
public override bool CanConvert(Type objectType)
|
||||
{
|
||||
return typeof(YPin).IsAssignableFrom(objectType);
|
||||
}
|
||||
|
||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||
{
|
||||
if (reader.TokenType == JsonToken.Null)
|
||||
return null;
|
||||
|
||||
return JArray.Load(reader)
|
||||
.Select(GetEvent)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class YPin
|
||||
{
|
||||
public YPinType Type { get; set; }
|
||||
}
|
||||
|
||||
public class YPin<T> : YPin
|
||||
{
|
||||
public T Data { get; set; }
|
||||
}
|
||||
public class YPin<T> : YPin
|
||||
{
|
||||
public T Data { get; set; }
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
namespace YandexMusic.API.Models.Pins.Items
|
||||
{
|
||||
public class YPinAlbumData
|
||||
{
|
||||
namespace YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
public class YPinAlbumData
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
namespace YandexMusic.API.Models.Pins.Items
|
||||
{
|
||||
public class YPinArtistData
|
||||
{
|
||||
namespace YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
public class YPinArtistData
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
64
YandexMusic.API/Models/Pins/Items/YPinConverter.cs
Normal file
64
YandexMusic.API/Models/Pins/Items/YPinConverter.cs
Normal file
@@ -0,0 +1,64 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
namespace YandexMusic.API.Models.Pins;
|
||||
|
||||
/// <summary>Конвертер для закреплённых объектов (пинов). Десериализует в конкретные типы на основе поля type.</summary>
|
||||
public class YPinConverter : JsonConverter<List<YPin>>
|
||||
{
|
||||
public override List<YPin> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||
{
|
||||
if (reader.TokenType != JsonTokenType.StartArray)
|
||||
throw new JsonException("Ожидается массив пинов");
|
||||
|
||||
var pins = new List<YPin>();
|
||||
while (reader.Read())
|
||||
{
|
||||
if (reader.TokenType == JsonTokenType.EndArray)
|
||||
break;
|
||||
|
||||
if (reader.TokenType != JsonTokenType.StartObject)
|
||||
throw new JsonException("Ожидается объект пина");
|
||||
|
||||
using var doc = JsonDocument.ParseValue(ref reader);
|
||||
var root = doc.RootElement;
|
||||
|
||||
var typeProp = root.GetProperty("type");
|
||||
var typeStr = typeProp.GetString();
|
||||
if (!Enum.TryParse<YPinType>(typeStr, true, out var pinType))
|
||||
throw new JsonException($"Неизвестный тип пина: {typeStr}");
|
||||
|
||||
YPin? pin = null;
|
||||
var rawText = root.GetRawText();
|
||||
|
||||
switch (pinType)
|
||||
{
|
||||
case YPinType.Album:
|
||||
pin = JsonSerializer.Deserialize<YPin<YPinAlbumData>>(rawText, options);
|
||||
break;
|
||||
case YPinType.Artist:
|
||||
pin = JsonSerializer.Deserialize<YPin<YPinArtistData>>(rawText, options);
|
||||
break;
|
||||
case YPinType.Playlist:
|
||||
pin = JsonSerializer.Deserialize<YPin<YPinPlaylistData>>(rawText, options);
|
||||
break;
|
||||
case YPinType.Wave:
|
||||
pin = JsonSerializer.Deserialize<YPin<YPinWaveData>>(rawText, options);
|
||||
break;
|
||||
default:
|
||||
pin = JsonSerializer.Deserialize<YPin>(rawText, options);
|
||||
break;
|
||||
}
|
||||
|
||||
if (pin != null)
|
||||
pins.Add(pin);
|
||||
}
|
||||
return pins;
|
||||
}
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, List<YPin> value, JsonSerializerOptions options)
|
||||
{
|
||||
JsonSerializer.Serialize(writer, value, options);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
namespace YandexMusic.API.Models.Pins.Items
|
||||
{
|
||||
public class YPinPlaylistData
|
||||
{
|
||||
namespace YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
public class YPinPlaylistData
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
namespace YandexMusic.API.Models.Pins.Items
|
||||
{
|
||||
public class YPinWaveData
|
||||
{
|
||||
namespace YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
public class YPinWaveData
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,18 @@
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace YandexMusic.API.Models.Pins
|
||||
namespace YandexMusic.API.Models.Pins;
|
||||
|
||||
public enum YPinType
|
||||
{
|
||||
public enum YPinType
|
||||
{
|
||||
[EnumMember(Value = "album_item")]
|
||||
Album,
|
||||
[EnumMember(Value = "album_item")]
|
||||
Album,
|
||||
|
||||
[EnumMember(Value = "artist_item")]
|
||||
Artist,
|
||||
[EnumMember(Value = "artist_item")]
|
||||
Artist,
|
||||
|
||||
[EnumMember(Value = "playlist_item")]
|
||||
Playlist,
|
||||
[EnumMember(Value = "playlist_item")]
|
||||
Playlist,
|
||||
|
||||
[EnumMember(Value = "wave_item")]
|
||||
Wave
|
||||
}
|
||||
[EnumMember(Value = "wave_item")]
|
||||
Wave,
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
using YandexMusic.API.Models.Pins.Items;
|
||||
using System.Text.Json.Serialization;
|
||||
using YandexMusic.API.Models.Pins.Items;
|
||||
|
||||
namespace YandexMusic.API.Models.Pins
|
||||
namespace YandexMusic.API.Models.Pins;
|
||||
|
||||
public class YPins
|
||||
{
|
||||
public class YPins
|
||||
{
|
||||
[JsonConverter(typeof(YPinConverter))]
|
||||
public List<YPin> Pins { get; set; }
|
||||
}
|
||||
[JsonConverter(typeof(YPinConverter))]
|
||||
public List<YPin> Pins { get; set; }
|
||||
}
|
||||
Reference in New Issue
Block a user