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-16 18:53:14 +03:00
parent 5a8ae3d680
commit 280c164626
12 changed files with 203 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using PlaylistShared.Api.Entities;
using PlaylistShared.Api.Extensions;
using PlaylistShared.Api.Services;
using PlaylistShared.Shared;
using PlaylistShared.Shared.Yandex;
@@ -87,7 +88,13 @@ public class AudioController : ControllerBase
{
Title = track.Title,
CoverUri = track.CoverUri,
Artists = track.Artists.Select(t => t.Name).ToList(),
Artists = track.Artists.Select(a => new YandexArtist
{
Id = a.Id,
Name = a.Name,
CoverUrl = a.Cover.GetUrl(),
Description = a.Description?.Text ?? string.Empty,
}).ToList(),
DurationMs = track.DurationMs,
}));
}

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

@@ -168,13 +168,19 @@ public class SharedPlaylistController : ControllerBase
{
return new YandexPlaylistData
{
Title = playlist.Title ?? "",
Description = playlist.Description ?? "",
Tracks = playlist.Tracks?.Select(t => new YandexTrack
Title = playlist.Title,
Description = playlist.Description,
Tracks = playlist.Tracks.Select(t => new YandexTrack
{
TrackId = t.Track?.Id ?? "",
Title = t.Track?.Title ?? "",
Artists = t.Track?.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
TrackId = t.Track.Id,
Title = t.Track.Title,
Artists = t.Track.Artists.Select(t => new YandexArtist()
{
Id = t.Id,
Name = t.Name,
CoverUrl = t.Cover.GetUrl(),
Description = t.Description?.Text ?? string.Empty,
}).ToList(),
DurationMs = (int)(t.Track?.DurationMs ?? 0),
CoverUri = t.Track?.CoverUri ?? ""
}).ToList() ?? new List<YandexTrack>()

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

@@ -30,7 +30,7 @@ public class YandexSearchController : ControllerBase
public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
[FromQuery] string query,
[FromQuery] int limit = 20,
[FromQuery] TrackSearchType? searchType = TrackSearchType.All,
[FromQuery] TrackSearchType searchType = TrackSearchType.All,
[FromQuery] bool byId = false,
[FromQuery] string? shared_id = null)
{
@@ -75,7 +75,7 @@ public class YandexSearchController : ControllerBase
if (byId)
{
results = await _yandexService.SearchTracksByIdAsync(user, query, searchType.Value, limit);
results = await _yandexService.SearchTracksByIdAsync(user, query, searchType, limit);
}
else
{

2
PlaylistShared.Api/PlaylistShared.Api.csproj
View File

@@ -27,7 +27,7 @@
<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.7" />
<PackageReference Include="YandexMusic" Version="0.0.8" />
</ItemGroup>
<ItemGroup>

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

@@ -137,7 +137,13 @@ public class YandexMusicService
{
TrackId = t.Id,
Title = t.Title,
Artists = t.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
Artists = t.Artists.Select(t => new YandexArtist()
{
Id = t.Id,
Name = t.Name,
CoverUrl = t.Cover.GetUrl(),
Description = t.Description?.Text ?? string.Empty,
}).ToList(),
CoverUri = t.CoverUri,
DurationMs = t.DurationMs,
}).ToList(),
@@ -149,7 +155,7 @@ public class YandexMusicService
OwnerUid = p.Owner?.Uid ?? string.Empty,
Title = p.Title,
Description = p.Description,
CoverUrl = p.CoverUri,
CoverUrl = string.IsNullOrEmpty(p.CoverUri) ? p.Cover.GetUrl() : p.CoverUri,
TrackCount = p.TrackCount,
}).ToList(),
@@ -185,43 +191,114 @@ public class YandexMusicService
int limit = 20
)
{
YandexSearchResult result = new();
var client = await CreateClientAsync(user);
if (client == null) return new YandexSearchResult();
if (client == null) return result;
var ySerchType = searchType switch
if (searchType == TrackSearchType.All)
{
TrackSearchType.Artist => YandexMusic.API.Models.Common.YSearchType.Artist,
TrackSearchType.Album => YandexMusic.API.Models.Common.YSearchType.Album,
TrackSearchType.Playlist => YandexMusic.API.Models.Common.YSearchType.Playlist,
TrackSearchType.Track => YandexMusic.API.Models.Common.YSearchType.Track,
_ => YandexMusic.API.Models.Common.YSearchType.All
};
IEnumerable<YTrack> searchResult = searchType switch
{
TrackSearchType.Playlist => (await client.GetPlaylistAsync(id)).Tracks.Select(t => t.Track),
TrackSearchType.Track => (await client.GetTracksAsync([id])),
TrackSearchType.Album => (await client.GetAlbumAsync(id)).Volumes.SelectMany(t => t),
TrackSearchType.Artist => (await client.GetArtistAsync(id)).Albums.SelectMany(t => t.Volumes.SelectMany(v => v)),
_ => new List<YTrack>()
};
if (searchType != TrackSearchType.Track)
{
searchResult = searchResult.Distinct();
if (limit > 0) searchResult = searchResult.Take(limit);
throw new Exception("Для поиска по ID необходимо указать конкретный тип (трек, альбом, исполнитель или плейлист).");
}
return new YandexSearchResult()
else if (searchType == TrackSearchType.Track)
{
Tracks = searchResult.Select(t => new YandexTrack
var track = await client.GetTrackAsync(id);
if (track != null)
{
TrackId = t.Id,
Title = t.Title,
Artists = t.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
CoverUri = t.CoverUri ?? string.Empty,
DurationMs = t.DurationMs,
}).ToList(),
};
result.Tracks = new List<YandexTrack>()
{
new()
{
TrackId = track.Id,
Title = track.Title,
Artists = track.Artists.Select(t => new YandexArtist()
{
Id = t.Id,
Name = t.Name,
CoverUrl = t.Cover.GetUrl(),
Description = t.Description?.Text ?? string.Empty,
}).ToList(),
CoverUri = track.CoverUri ?? string.Empty,
DurationMs = track.DurationMs,
}
};
}
}
else if (searchType == TrackSearchType.Album)
{
var album = await client.GetAlbumAsync(id);
if (album != null)
{
result.Tracks = album.Volumes.SelectMany(v => v).Select(t => new YandexTrack
{
TrackId = t.Id,
Title = t.Title,
Artists = t.Artists.Select(t => new YandexArtist()
{
Id = t.Id,
Name = t.Name,
CoverUrl = t.Cover.GetUrl(),
Description = t.Description?.Text ?? string.Empty,
}).ToList(),
CoverUri = t.CoverUri ?? string.Empty,
DurationMs = t.DurationMs,
}).ToList();
}
}
else if (searchType == TrackSearchType.Artist)
{
var artist = await client.GetArtistAsync(id);
if (artist != null)
{
result.Albums = artist.Albums.Select(a => new YandexAlbum()
{
Id = a.Id,
Title = a.Title,
Artists = a.Artists.Select(t => new YandexArtist()
{
Id = t.Id,
Name = t.Name,
CoverUrl = t.Cover.GetUrl(),
Description = t.Description?.Text ?? string.Empty,
}).ToList(),
CoverUrl = string.IsNullOrEmpty(a.CoverUri) ? a.Cover.GetUrl() : a.CoverUri,
Description = a.Description,
}).ToList();
result.Playlists = artist.Playlists.Select(p => new YandexPlaylist
{
Uuid = p.PlaylistUuid,
Kind = p.Kind,
OwnerUid = p.Owner?.Uid ?? string.Empty,
Title = p.Title,
Description = p.Description,
CoverUrl = p.Cover.GetUrl(),
TrackCount = p.TrackCount,
}).ToList();
result.Tracks = artist.PopularTracks.Select(t => new YandexTrack
{
TrackId = t.Id,
Title = t.Title,
Artists = t.Artists.Select(a => new YandexArtist()
{
Id = a.Id,
Name = a.Name,
CoverUrl = a.Cover.GetUrl(),
Description = a.Description?.Text ?? string.Empty,
}).ToList(),
CoverUri = t.CoverUri ?? string.Empty,
DurationMs = t.DurationMs,
}).ToList();
}
}
return result;
}
}