Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5541d0ad27 | ||
|
|
ea9f392896 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -361,4 +361,4 @@ MigrationBackup/
|
||||
|
||||
# Fody - auto-generated XML schema
|
||||
FodyWeavers.xsd
|
||||
/YaMusicCli/YaMusicCli.csproj
|
||||
YaMusicCli/
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
using YandexMusic.API.Extensions.API;
|
||||
|
||||
internal class Program
|
||||
{
|
||||
private async static Task Main(string[] args)
|
||||
{
|
||||
var client = new YandexMusic.YandexMusicClient();
|
||||
var type = await client.Authorize("y0__xDy2budARje-AYg7rmliBc11LbYoMeUiwiO6f6mSCAMDYVIKg");
|
||||
var playlists = (await client.GetFavoritesAsync()).Where(t => t.Owner.Uid == client.Account.Uid).ToList();
|
||||
var playlist = await client.GetPlaylistAsync("97ae0768-8a40-8485-9fa4-b6c856bc6b21");
|
||||
var tracks = playlist.Tracks.Where(t => t.Id == "21696942").Select(t => t.Track).ToArray();
|
||||
var x = await playlist.RemoveTracksAsync(tracks);
|
||||
Console.WriteLine($"TC: {playlist.TrackCount}; {playlist.Title}");
|
||||
Console.ReadKey();
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,7 @@ public abstract class CommonRequestProvider : IRequestProvider
|
||||
Converters = {
|
||||
new JsonStringEnumConverter(JsonNamingPolicy.KebabCaseLower),
|
||||
new IntToStringConverter(),
|
||||
new StringToIntConverter(),
|
||||
new YExecutionContextConverter(api, storage),
|
||||
}
|
||||
};
|
||||
|
||||
42
YandexMusic.API/Converters/StringToIntConverter.cs
Normal file
42
YandexMusic.API/Converters/StringToIntConverter.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace YandexMusic.API.Converters;
|
||||
|
||||
public class StringToIntConverter : JsonConverter<int>
|
||||
{
|
||||
public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||
{
|
||||
// Если текущий токен — строка
|
||||
if (reader.TokenType == JsonTokenType.String)
|
||||
{
|
||||
string? stringValue = reader.GetString();
|
||||
if (string.IsNullOrEmpty(stringValue))
|
||||
{
|
||||
throw new JsonException("Строка не может быть пустой или null для преобразования в int.");
|
||||
}
|
||||
|
||||
// Пробуем распарсить с учётом возможных пробелов и инвариантной культуры
|
||||
if (int.TryParse(stringValue.Trim(), out int result))
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
throw new JsonException($"Невозможно преобразовать строку \"{stringValue}\" в int.");
|
||||
}
|
||||
|
||||
// Если токен — число (стандартное поведение)
|
||||
if (reader.TokenType == JsonTokenType.Number)
|
||||
{
|
||||
return reader.GetInt32();
|
||||
}
|
||||
|
||||
throw new JsonException($"Ожидалась строка или число, получен {reader.TokenType}.");
|
||||
}
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options)
|
||||
{
|
||||
// Записываем число как обычное JSON-число
|
||||
writer.WriteNumberValue(value);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using YandexMusic.API.Models.Album;
|
||||
using YandexMusic.API.Models.Common;
|
||||
using YandexMusic.API.Models.Common.Cover;
|
||||
@@ -11,7 +10,6 @@ public class YArtistBriefInfo
|
||||
{
|
||||
public YButton ActionButton { get; set; }
|
||||
public List<YAlbum> Albums { get; set; }
|
||||
[JsonConverter(typeof(YCoverConverter))]
|
||||
public List<YCover> AllCovers { get; set; }
|
||||
public List<YAlbum> AlsoAlbums { get; set; }
|
||||
public YArtist Artist { get; set; }
|
||||
|
||||
@@ -1,33 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace YandexMusic.API.Models.Common.Cover;
|
||||
|
||||
public class YCoverConverter : JsonConverter<YCover>
|
||||
{
|
||||
public override YCover? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||
{
|
||||
if (reader.TokenType != JsonTokenType.StartObject) return null;
|
||||
using var doc = JsonDocument.ParseValue(ref reader);
|
||||
var root = doc.RootElement;
|
||||
var type = root.TryGetProperty("type", out var t) ? t.GetString() : null;
|
||||
if (root.TryGetProperty("error", out _)) type = "error";
|
||||
|
||||
return type switch
|
||||
{
|
||||
"color" => JsonSerializer.Deserialize<YCoverColor>(root.GetRawText(), options),
|
||||
"error" => JsonSerializer.Deserialize<YCoverError>(root.GetRawText(), options),
|
||||
"from-artist-photos" or "from-album-cover" => JsonSerializer.Deserialize<YCoverImage>(root.GetRawText(), options),
|
||||
"pic" => JsonSerializer.Deserialize<YCoverPic>(root.GetRawText(), options),
|
||||
"mosaic" => JsonSerializer.Deserialize<YCoverMosaic>(root.GetRawText(), options),
|
||||
_ => new YCover() { Type = YCoverType.Error }
|
||||
};
|
||||
}
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, YCover value, JsonSerializerOptions options)
|
||||
=> JsonSerializer.Serialize(writer, value, options);
|
||||
}
|
||||
|
||||
[JsonConverter(typeof(YCoverConverter))]
|
||||
public class YCover
|
||||
{
|
||||
|
||||
29
YandexMusic.API/Models/Common/Cover/YCoverConverter.cs
Normal file
29
YandexMusic.API/Models/Common/Cover/YCoverConverter.cs
Normal file
@@ -0,0 +1,29 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace YandexMusic.API.Models.Common.Cover;
|
||||
|
||||
public class YCoverConverter : JsonConverter<YCover>
|
||||
{
|
||||
public override YCover? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||
{
|
||||
if (reader.TokenType != JsonTokenType.StartObject) return null;
|
||||
using var doc = JsonDocument.ParseValue(ref reader);
|
||||
var root = doc.RootElement;
|
||||
var type = root.TryGetProperty("type", out var t) ? t.GetString() : null;
|
||||
if (root.TryGetProperty("error", out _)) type = "error";
|
||||
|
||||
return type switch
|
||||
{
|
||||
"color" => JsonSerializer.Deserialize<YCoverColor>(root.GetRawText(), options),
|
||||
"error" => JsonSerializer.Deserialize<YCoverError>(root.GetRawText(), options),
|
||||
"from-artist-photos" or "from-album-cover" => JsonSerializer.Deserialize<YCoverImage>(root.GetRawText(), options),
|
||||
"pic" => JsonSerializer.Deserialize<YCoverPic>(root.GetRawText(), options),
|
||||
"mosaic" => JsonSerializer.Deserialize<YCoverMosaic>(root.GetRawText(), options),
|
||||
_ => new YCover() { Type = YCoverType.Error }
|
||||
};
|
||||
}
|
||||
|
||||
public override void Write(Utf8JsonWriter writer, YCover value, JsonSerializerOptions options)
|
||||
=> JsonSerializer.Serialize(writer, value, options);
|
||||
}
|
||||
Reference in New Issue
Block a user