FrigaT/PlaylistShared
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Переработана страница поиска и добавления треков в плейлист

Browse Source
This commit is contained in:
FrigaT
2026-04-15 14:07:33 +03:00
parent c7bd97462a
commit e00b7a735c
26 changed files with 497 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PlaylistShared.Api/Controllers/FavoritesController.cs
View File

@@ -5,7 +5,7 @@ using PlaylistShared.Api.Entities;
using PlaylistShared.Api.Extensions;
using PlaylistShared.Api.Services;
using PlaylistShared.Shared;
using PlaylistShared.Shared.Shared;
using PlaylistShared.Shared.SharedPlaylist;
namespace PlaylistShared.Api.Controllers;

2
PlaylistShared.Api/Controllers/PlaylistsController.cs
View File

@@ -7,7 +7,7 @@ using PlaylistShared.Api.Services;
using PlaylistShared.Shared;
using PlaylistShared.Shared.Enums;
using PlaylistShared.Shared.Playlist;
using PlaylistShared.Shared.Shared;
using PlaylistShared.Shared.SharedPlaylist;
using YandexMusic;
namespace PlaylistShared.Api.Controllers;

23
PlaylistShared.Api/Controllers/SharedPlaylistController.cs
View File

@@ -6,7 +6,7 @@ using PlaylistShared.Api.Extensions;
using PlaylistShared.Api.Services;
using PlaylistShared.Shared;
using PlaylistShared.Shared.DTO;
using PlaylistShared.Shared.Shared;
using PlaylistShared.Shared.SharedPlaylist;
using YandexMusic.API.Models.Playlist;
[ApiController]
@@ -101,7 +101,7 @@ public class SharedPlaylistController : ControllerBase
// POST /api/sharedplaylist/{token}/add-tracks
[HttpPost("{token}/add-tracks")]
public async Task<ActionResult<ApiResponse<object>>> AddTracks(string token, [FromBody] AddTracksRequest request)
public async Task<ActionResult<ApiResponse<object>>> AddTracks(string token, [FromBody] UpdateTrackListRequest request)
{
var currentUserId = User.GetUserIdOrNull();
var playlist = await _sharedService.GetEntityByTokenAsync(token);
@@ -131,7 +131,7 @@ public class SharedPlaylistController : ControllerBase
// POST /api/sharedplaylist/{token}/remove-tracks
[HttpPost("{token}/remove-tracks")]
public async Task<ActionResult<ApiResponse<object>>> RemoveTracks(string token, [FromBody] RemoveTracksRequest request)
public async Task<ActionResult<ApiResponse<object>>> RemoveTracks(string token, [FromBody] UpdateTrackListRequest request)
{
var currentUserId = User.GetUserIdOrNull();
var playlist = await _sharedService.GetEntityByTokenAsync(token);
@@ -164,23 +164,6 @@ public class SharedPlaylistController : ControllerBase
return Ok(ApiResponse<object>.Ok(new { message = "Треки удалены" }));
}
// POST /api/sharedplaylist/{token}/add-track-by-link
[HttpPost("{token}/add-track-by-link")]
public async Task<ActionResult<ApiResponse<object>>> AddTrackByLink(string token, [FromBody] AddTrackByLinkRequest request)
{
var trackId = ExtractTrackIdFromLink(request.Link);
if (string.IsNullOrEmpty(trackId))
return BadRequest(ApiResponse<object>.Fail(new ErrorResponse { StatusCode = 400, Message = "Неверный формат ссылки" }));
return await AddTracks(token, new AddTracksRequest { TrackIds = new List<string> { trackId } });
}
private string? ExtractTrackIdFromLink(string link)
{
var match = System.Text.RegularExpressions.Regex.Match(link, @"/track/(\d+)");
return match.Success ? match.Groups[1].Value : null;
}
private YandexPlaylistData MapToYandexPlaylistData(YPlaylist playlist)
{
return new YandexPlaylistData

17
PlaylistShared.Api/Controllers/YandexSearchController.cs
View File

@@ -6,6 +6,7 @@ using PlaylistShared.Api.Extensions;
using PlaylistShared.Api.Services;
using PlaylistShared.Shared;
using PlaylistShared.Shared.DTO;
using PlaylistShared.Shared.Enums;
namespace PlaylistShared.Api.Controllers;
@@ -26,9 +27,11 @@ public class YandexSearchController : ControllerBase
}
[HttpGet("tracks")]
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchTracks(
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchQuery(
[FromQuery] string query,
[FromQuery] int limit = 20,
[FromQuery] TrackSearchType? searchType = TrackSearchType.All,
[FromQuery] bool byId = false,
[FromQuery] string? shared_id = null)
{
if (string.IsNullOrWhiteSpace(query))
@@ -68,7 +71,17 @@ public class YandexSearchController : ControllerBase
Message = "Токен Яндекс.Музыки не установлен или недействителен."
}));
var results = await _yandexService.SearchTracksAsync(user, query, limit);
List<YandexTrack>? results = null;
if (byId)
{
results = await _yandexService.SearchTracksByIdAsync(user, query, searchType.Value, limit);
}
else
{
results = await _yandexService.SearchTracksAsync(user, query, searchType, limit);
}
return Ok(ApiResponse<List<YandexTrack>>.Ok(results));
}
}