From ea9f392896b8afed02345411cecd5ab52fcdc51e Mon Sep 17 00:00:00 2001 From: FrigaT Date: Tue, 14 Apr 2026 21:25:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=B5=D1=80?= =?UTF-8?q?=20string->int?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- YaMusicCli/Program.cs | 16 ------- .../Common/Providers/CommonRequestProvider.cs | 1 + .../Converters/StringToIntConverter.cs | 42 +++++++++++++++++++ 4 files changed, 44 insertions(+), 17 deletions(-) delete mode 100644 YaMusicCli/Program.cs create mode 100644 YandexMusic.API/Converters/StringToIntConverter.cs diff --git a/.gitignore b/.gitignore index 7db848a..bea53aa 100644 --- a/.gitignore +++ b/.gitignore @@ -361,4 +361,4 @@ MigrationBackup/ # Fody - auto-generated XML schema FodyWeavers.xsd -/YaMusicCli/YaMusicCli.csproj +YaMusicCli/ diff --git a/YaMusicCli/Program.cs b/YaMusicCli/Program.cs deleted file mode 100644 index 8480ebf..0000000 --- a/YaMusicCli/Program.cs +++ /dev/null @@ -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(); - } -} \ No newline at end of file diff --git a/YandexMusic.API/Common/Providers/CommonRequestProvider.cs b/YandexMusic.API/Common/Providers/CommonRequestProvider.cs index 3f7e97d..9519d32 100644 --- a/YandexMusic.API/Common/Providers/CommonRequestProvider.cs +++ b/YandexMusic.API/Common/Providers/CommonRequestProvider.cs @@ -36,6 +36,7 @@ public abstract class CommonRequestProvider : IRequestProvider Converters = { new JsonStringEnumConverter(JsonNamingPolicy.KebabCaseLower), new IntToStringConverter(), + new StringToIntConverter(), new YExecutionContextConverter(api, storage), } }; diff --git a/YandexMusic.API/Converters/StringToIntConverter.cs b/YandexMusic.API/Converters/StringToIntConverter.cs new file mode 100644 index 0000000..d48a914 --- /dev/null +++ b/YandexMusic.API/Converters/StringToIntConverter.cs @@ -0,0 +1,42 @@ +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace YandexMusic.API.Converters; + +public class StringToIntConverter : JsonConverter +{ + 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); + } +} \ No newline at end of file