Полностью переписанное api
All checks were successful
Release / pack-and-publish (release) Successful in 36s

This commit is contained in:
FrigaT
2026-04-19 17:00:05 +03:00
parent 5541d0ad27
commit 36e28ce3fe
111 changed files with 1552 additions and 3358 deletions

View File

@@ -1,24 +1,13 @@
using System.Net;
using YandexMusic.API.Common;
using YandexMusic.API.Models.Common;
using YandexMusic.API.Models.Queue;
using YandexMusic.API.Requests.Common;
using YandexMusic.API.Requests.Common.Attributes;
namespace YandexMusic.API.Requests.Queue;
[YApiRequest(WebRequestMethods.Http.Get, "queues/{queueId}")]
public class YGetQueueBuilder : YRequestBuilder<YResponse<YQueue>, string>
public class YGetQueueBuilder : YMusicRequestBuilder<YQueue?, string>
{
public YGetQueueBuilder(YandexMusicApi yandex, AuthStorage auth) : base(yandex, auth)
{
}
public YGetQueueBuilder(YandexMusicApi api) : base(api) { }
protected override string Method => WebRequestMethods.Http.Get;
protected override string PathTemplate => "queues/{queueId}";
protected override Dictionary<string, string> GetSubstitutions(string queueId)
{
return new Dictionary<string, string> {
{ "queueId", queueId }
};
}
}
=> new() { { "queueId", queueId } };
}

View File

@@ -4,40 +4,29 @@ using System.Net.Http.Json;
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
using YandexMusic.API.Common;
using YandexMusic.API.Models.Common;
using YandexMusic.API.Models.Queue;
using YandexMusic.API.Requests.Common;
using YandexMusic.API.Requests.Common.Attributes;
namespace YandexMusic.API.Requests.Queue;
[YApiRequest(WebRequestMethods.Http.Post, "queues")]
public class YQueueCreateBuilder : YRequestBuilder<YResponse<YNewQueue>, YQueue>
public class YQueueCreateBuilder : YMusicRequestBuilder<YNewQueue?, YQueue>
{
public YQueueCreateBuilder(YandexMusicApi yandex, AuthStorage auth, string? device = null) : base(yandex, auth)
private string? _device;
public YQueueCreateBuilder(YandexMusicApi api, string? device = null) : base(api) => _device = device;
protected override string Method => WebRequestMethods.Http.Post;
protected override string PathTemplate => "queues";
protected override HttpContent? GetContent(YQueue queue)
{
if (device != null)
this.device = device;
}
protected override HttpContent GetContent(YQueue queue)
{
JsonSerializerOptions settings = new()
var options = new JsonSerializerOptions
{
Converters = {
new JsonStringEnumConverter()
},
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
Converters = { new JsonStringEnumConverter() }
};
return JsonContent.Create(queue, new MediaTypeHeaderValue("application/json"), settings);
return JsonContent.Create(queue, new MediaTypeHeaderValue("application/json"), options);
}
protected override void SetCustomHeaders(HttpRequestHeaders headers)
{
headers.Add("X-Yandex-Music-Device", device);
if (!string.IsNullOrEmpty(_device))
headers.Add("X-Yandex-Music-Device", _device);
}
}
}

View File

@@ -1,41 +1,27 @@
using System.Collections.Specialized;
using System.Net;
using System.Net.Http.Headers;
using YandexMusic.API.Common;
using YandexMusic.API.Models.Common;
using YandexMusic.API.Models.Queue;
using YandexMusic.API.Requests.Common;
using YandexMusic.API.Requests.Common.Attributes;
namespace YandexMusic.API.Requests.Queue;
[YApiRequest(WebRequestMethods.Http.Post, "queues/{queueId}/update-position")]
public class YQueueUpdatePositionBuilder : YRequestBuilder<YResponse<YUpdatedQueue>, (string queueId, int currentIndex, bool isInteractive)>
public class YQueueUpdatePositionBuilder : YMusicRequestBuilder<YUpdatedQueue?, (string queueId, int currentIndex, bool isInteractive)>
{
public YQueueUpdatePositionBuilder(YandexMusicApi yandex, AuthStorage auth, string device = null) : base(yandex, auth)
{
if (device != null)
this.device = device;
}
private string? _device;
public YQueueUpdatePositionBuilder(YandexMusicApi api, string? device = null) : base(api) => _device = device;
protected override string Method => WebRequestMethods.Http.Post;
protected override string PathTemplate => "queues/{queueId}/update-position";
protected override Dictionary<string, string> GetSubstitutions((string queueId, int currentIndex, bool isInteractive) tuple)
{
return new Dictionary<string, string> {
{ "queueId", tuple.queueId },
};
}
protected override void SetCustomHeaders(HttpRequestHeaders headers)
{
headers.Add("X-Yandex-Music-Device", device);
}
=> new() { { "queueId", tuple.queueId } };
protected override NameValueCollection GetQueryParams((string queueId, int currentIndex, bool isInteractive) tuple)
{
return new NameValueCollection {
=> new()
{
{ "currentIndex", tuple.currentIndex.ToString() },
{ "isInteractive", tuple.isInteractive.ToString().ToLower() }
};
protected override void SetCustomHeaders(HttpRequestHeaders headers)
{
if (!string.IsNullOrEmpty(_device))
headers.Add("X-Yandex-Music-Device", _device);
}
}
}

View File

@@ -1,25 +1,18 @@
using System.Net;
using System.Net.Http.Headers;
using YandexMusic.API.Common;
using YandexMusic.API.Models.Common;
using YandexMusic.API.Models.Queue;
using YandexMusic.API.Requests.Common;
using YandexMusic.API.Requests.Common.Attributes;
namespace YandexMusic.API.Requests.Queue;
[YApiRequest(WebRequestMethods.Http.Get, "queues")]
public class YQueuesListBuilder : YRequestBuilder<YResponse<YQueueItemsContainer>, string>
public class YQueuesListBuilder : YMusicRequestBuilder<YQueueItemsContainer?, string?>
{
public YQueuesListBuilder(YandexMusicApi yandex, AuthStorage auth, string? device = null) : base(yandex, auth)
{
if (device != null)
this.device = device;
}
private string? _device;
public YQueuesListBuilder(YandexMusicApi api, string? device = null) : base(api) => _device = device;
protected override string Method => WebRequestMethods.Http.Get;
protected override string PathTemplate => "queues";
protected override void SetCustomHeaders(HttpRequestHeaders headers)
{
headers.Add("X-Yandex-Music-Device", device);
if (!string.IsNullOrEmpty(_device))
headers.Add("X-Yandex-Music-Device", _device);
}
}
}