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-14 22:26:58 +03:00
parent 0381ef74ab
commit 6ae49faf15
16 changed files with 92 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PlaylistShared.Api/Controllers/AudioController.cs
View File

@@ -74,7 +74,7 @@ public class AudioController : ControllerBase
[HttpGet("track-info/{trackId}")]
[AllowAnonymous]
public async Task<ActionResult<ApiResponse<TrackInfoDto>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
public async Task<ActionResult<ApiResponse<YandexTrack>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
{
var user = await GetUserFromToken(access_token);
if (user == null) user = await GetUserFromSharedPlaylistId(shared_id);
@@ -83,10 +83,12 @@ public class AudioController : ControllerBase
var track = await _yandexService.GetYTrackAsync(user, trackId);
if (track == null) return NotFound();
return Ok(ApiResponse<TrackInfoDto>.Ok(new TrackInfoDto
return Ok(ApiResponse<YandexTrack>.Ok(new YandexTrack
{
Title = track.Title,
CoverUri = track.CoverUri,
Artists = track.Artists.Select(t => t.Name).ToList(),
DurationMs = track.DurationMs,
}));
}

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

@@ -189,7 +189,7 @@ public class SharedPlaylistController : ControllerBase
Description = playlist.Description ?? "",
Tracks = playlist.Tracks?.Select(t => new YandexTrack
{
Id = t.Track?.Id ?? "",
TrackId = t.Track?.Id ?? "",
Title = t.Track?.Title ?? "",
Artists = t.Track?.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
DurationMs = (int)(t.Track?.DurationMs ?? 0),

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

@@ -26,13 +26,13 @@ public class YandexSearchController : ControllerBase
}
[HttpGet("tracks")]
public async Task<ActionResult<ApiResponse<List<YandexTrackSearchResult>>>> SearchTracks(
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchTracks(
[FromQuery] string query,
[FromQuery] int limit = 20,
[FromQuery] string? shared_id = null)
{
if (string.IsNullOrWhiteSpace(query))
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
{
StatusCode = 400,
Message = "Поисковый запрос не может быть пустым."
@@ -62,13 +62,13 @@ public class YandexSearchController : ControllerBase
var decryptedToken = _yandexService.DecryptToken(user.YandexAccessToken);
if (string.IsNullOrEmpty(decryptedToken))
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
{
StatusCode = 400,
Message = "Токен Яндекс.Музыки не установлен или недействителен."
}));
var results = await _yandexService.SearchTracksAsync(user, query, limit);
return Ok(ApiResponse<List<YandexTrackSearchResult>>.Ok(results));
return Ok(ApiResponse<List<YandexTrack>>.Ok(results));
}
}

20
PlaylistShared.Api/PlaylistShared.Api.csproj
View File

@@ -10,24 +10,24 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.6" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.6" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.6" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
<PackageReference Include="YandexMusic" Version="0.0.6" />
<PackageReference Include="YandexMusic" Version="0.0.7" />
</ItemGroup>
<ItemGroup>

20
PlaylistShared.Api/Services/YandexMusicService.cs
View File

@@ -55,12 +55,16 @@ public class YandexMusicService
{
var client = await CreateClientAsync(user);
if (client == null) return null;
// Получаем треки по ID
var tracks = await client.GetTracksAsync(trackIds);
if (tracks == null || !tracks.Any()) return null;
var playlist = await client.GetPlaylistAsync(ownerUid, kind);
if (playlist == null) return null;
return await playlist.InsertTracksAsync(tracks.ToArray());
var tracks = await client.GetTracksAsync(trackIds);
if (tracks == null || !tracks.Any()) return null;
var insertedTracks = tracks.Where(t => !playlist.Tracks.Any(p => p.Track.Id == t.Id)).ToArray();
return await playlist.InsertTracksAsync(insertedTracks);
}
public async Task<YPlaylist?> RemoveTracksAsync(ApplicationUser user, string ownerUid, string kind, IEnumerable<string> trackIds)
@@ -103,15 +107,15 @@ public class YandexMusicService
}
}
public async Task<List<YandexTrackSearchResult>> SearchTracksAsync(ApplicationUser user, string query, int limit = 20)
public async Task<List<YandexTrack>> SearchTracksAsync(ApplicationUser user, string query, int limit = 20)
{
var client = await CreateClientAsync(user);
if (client == null) return new List<YandexTrackSearchResult>();
if (client == null) return new List<YandexTrack>();
var searchResult = await client.SearchAsync(query, YandexMusic.API.Models.Common.YSearchType.Track, page: 0, pageSize: limit);
if (searchResult?.Tracks?.Results == null) return new List<YandexTrackSearchResult>();
if (searchResult?.Tracks?.Results == null) return new List<YandexTrack>();
return searchResult.Tracks.Results.Select(t => new YandexTrackSearchResult
return searchResult.Tracks.Results.Select(t => new YandexTrack
{
TrackId = t.Id,
Title = t.Title,