Доработано получение плейлистов

PlaylistShared.Api/Controllers/AudioController.cs

@@ -2,9 +2,10 @@
 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.DTO;
+using PlaylistShared.Shared.Yandex;
 using System.Security.Claims;
 
 namespace PlaylistShared.Api.Controllers;
@@ -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,
         }));
     }

PlaylistShared.Api/Controllers/PlaylistsController.cs

@@ -6,7 +6,7 @@ using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Playlist;
+using PlaylistShared.Shared.Yandex;
 using PlaylistShared.Shared.SharedPlaylist;
 using YandexMusic;
 
@@ -32,7 +32,7 @@ public class PlaylistsController : ControllerBase
     }
 
     [HttpGet]
-    public async Task<ActionResult<ApiResponse<List<YandexPlaylistInfo>>>> GetMyPlaylists()
+    public async Task<ActionResult<ApiResponse<List<YandexPlaylistShare>>>> GetMyPlaylists()
     {
         var userId = User.GetUserId();
         var user = await _userManager.FindByIdAsync(userId.ToString());
@@ -52,7 +52,7 @@ public class PlaylistsController : ControllerBase
 
         var sharedPlaylists = await _sharedService.GetAllByUserAsync(userId);
 
-        var result = ownPlaylists.Select(p => new YandexPlaylistInfo
+        var result = ownPlaylists.Select(p => new YandexPlaylistShare
         {
             Kind = p.Kind,
             OwnerUid = p.Owner.Uid,
@@ -63,7 +63,7 @@ public class PlaylistsController : ControllerBase
             ShareToken = sharedPlaylists.FirstOrDefault(s => s.YandexPlaylistKind == p.Kind && s.YandexPlaylistOwnerUid == p.Owner.Uid)?.ShareToken,
         }).ToList();
 
-        return Ok(ApiResponse<List<YandexPlaylistInfo>>.Ok(result));
+        return Ok(ApiResponse<List<YandexPlaylistShare>>.Ok(result));
     }
 
     [HttpPost("share")]

PlaylistShared.Api/Controllers/SharedPlaylistController.cs

@@ -5,8 +5,8 @@ using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
 using PlaylistShared.Shared.SharedPlaylist;
+using PlaylistShared.Shared.Yandex;
 using YandexMusic.API.Models.Playlist;
 
 [ApiController]
@@ -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>()

PlaylistShared.Api/Controllers/YandexSearchController.cs

@@ -5,8 +5,8 @@ using PlaylistShared.Api.Entities;
 using PlaylistShared.Api.Extensions;
 using PlaylistShared.Api.Services;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
 using PlaylistShared.Shared.Enums;
+using PlaylistShared.Shared.Yandex;
 
 namespace PlaylistShared.Api.Controllers;
 
@@ -26,16 +26,16 @@ public class YandexSearchController : ControllerBase
         _sharedPlaylistService = sharedPlaylistService;
     }
 
-    [HttpGet("tracks")]
-    public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchQuery(
+    [HttpGet("search")]
+    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)
     {
         if (string.IsNullOrWhiteSpace(query))
-            return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
+            return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
             {
                 StatusCode = 400,
                 Message = "Поисковый запрос не может быть пустым."
@@ -65,23 +65,23 @@ public class YandexSearchController : ControllerBase
 
         var decryptedToken = _yandexService.DecryptToken(user.YandexAccessToken);
         if (string.IsNullOrEmpty(decryptedToken))
-            return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
+            return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
             {
                 StatusCode = 400,
                 Message = "Токен Яндекс.Музыки не установлен или недействителен."
             }));
 
-        List<YandexTrack>? results = null;
+        YandexSearchResult? results = null;
 
         if (byId)
         {
-            results = await _yandexService.SearchTracksByIdAsync(user, query, searchType.Value, limit);
+            results = await _yandexService.SearchTracksByIdAsync(user, query, searchType, limit);
         }
         else
         {
-            results = await _yandexService.SearchTracksAsync(user, query, searchType, limit);
+            results = await _yandexService.SearchAsync(user, query, searchType, limit);
         }
 
-        return Ok(ApiResponse<List<YandexTrack>>.Ok(results));
+        return Ok(ApiResponse<YandexSearchResult>.Ok(results));
     }
 }

PlaylistShared.Api/Extensions/YCoverExtensions.cs

@@ -4,14 +4,16 @@ namespace PlaylistShared.Api.Extensions;
 
 public static class YCoverExtensions
 {
-    public static string GetUrl(this YCover cover, string size = "200x200")
+    public static string GetUrl(this YCover cover)
     {
         switch (cover)
         {
             case YCoverImage img when !string.IsNullOrEmpty(img.Uri):
-                return $"https://{img.Uri.Replace("%%", size)}";
+                return img.Uri;
             case YCoverPic pic when !string.IsNullOrEmpty(pic.Uri):
-                return $"https://{pic.Uri.Replace("%%", size)}";
+                return pic.Uri;
+            case YCoverMosaic mosaic when mosaic.ItemsUri.Any():
+                return mosaic.ItemsUri.First();
             default:
                 return string.Empty;
         }

PlaylistShared.Api/PlaylistShared.Api.csproj

@@ -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>

PlaylistShared.Api/Services/SharedPlaylistService.cs

@@ -3,7 +3,6 @@ using PlaylistShared.Api.Data;
 using PlaylistShared.Api.Entities;
 using PlaylistShared.Shared.Auth;
 using PlaylistShared.Shared.Enums;
-using PlaylistShared.Shared.Playlist;
 using PlaylistShared.Shared.SharedPlaylist;
 
 namespace PlaylistShared.Api.Services;

PlaylistShared.Api/Services/YandexMusicService.cs

@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.DataProtection;
 using PlaylistShared.Api.Entities;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Api.Extensions;
 using PlaylistShared.Shared.Enums;
+using PlaylistShared.Shared.Yandex;
 using YandexMusic;
 using YandexMusic.API.Extensions.API;
 using YandexMusic.API.Models.Playlist;
@@ -108,7 +109,7 @@ public class YandexMusicService
         }
     }
 
-    public async Task<List<YandexTrack>> SearchTracksAsync(
+    public async Task<YandexSearchResult> SearchAsync(
         ApplicationUser user,
         string query,
         TrackSearchType? searchType = TrackSearchType.All,
@@ -116,7 +117,7 @@ public class YandexMusicService
         )
     {
         var client = await CreateClientAsync(user);
-        if (client == null) return new List<YandexTrack>();
+        if (client == null) return new YandexSearchResult();
 
         var ySerchType = searchType switch
         {
@@ -128,59 +129,193 @@ public class YandexMusicService
         };
 
         var searchResult = await client.SearchAsync(query, ySerchType, page: 0, pageSize: limit);
-        if (searchResult?.Tracks?.Results == null) return new List<YandexTrack>();
+        if (searchResult?.Tracks?.Results == null) return new YandexSearchResult();
 
-        return searchResult.Tracks.Results.Select(t => new YandexTrack
+        return new YandexSearchResult
         {
-            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();
+            Tracks = searchResult.Tracks.Results.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,
+                DurationMs = t.DurationMs,
+            }).ToList(),
+
+            Playlists = searchResult.Playlists?.Results.Select(p => new YandexPlaylist
+            {
+                Uuid = p.PlaylistUuid,
+                Kind = p.Kind,
+                OwnerUid = p.Owner?.Uid ?? string.Empty,
+                Title = p.Title,
+                Description = p.Description,
+                CoverUrl = string.IsNullOrEmpty(p.CoverUri) ? p.Cover.GetUrl() : p.CoverUri,
+                TrackCount = p.TrackCount,
+            }).ToList(),
+
+            Artists = searchResult.Artists?.Results.Select(a => new YandexArtist
+            {
+                Id = a.Id,
+                Name = a.Name,
+                CoverUrl = a.Cover.GetUrl(),
+                Description = a.Description?.Text ?? string.Empty,
+            }).ToList(),
+
+            Albums = searchResult.Albums?.Results.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(),
+        };
     }
 
-    public async Task<List<YandexTrack>> SearchTracksByIdAsync(
+    public async Task<YandexSearchResult> SearchTracksByIdAsync(
         ApplicationUser user,
         string id,
         TrackSearchType searchType,
         int limit = 20
         )
     {
+        YandexSearchResult result = new();
+
         var client = await CreateClientAsync(user);
-        if (client == null) return new List<YandexTrack>();
+        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 searchResult.Select(t => new YandexTrack
+        else if (searchType == TrackSearchType.Track)
         {
-            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();
+            var track = await client.GetTrackAsync(id);
+
+            if (track != null)
+            {
+                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);
+
+            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();
+            }
+        }
+
+        else if (searchType == TrackSearchType.Playlist)
+        {
+            var playlist = await client.GetPlaylistAsync(id);
+
+            result.Tracks = playlist?.Tracks.Select(p => new YandexTrack
+            {
+                TrackId = p.Track.Id,
+                CoverUri = p.Track.CoverUri,
+                Artists = p.Track.Artists.Select(a => new YandexArtist
+                {
+                    Id = a.Id,
+                    Name = a.Name,
+                    CoverUrl = a.Cover.GetUrl(),
+                    Description = a.Description?.Text ?? string.Empty,
+                }).ToList(),
+                Title = p.Track.Title,
+                DurationMs = p.Track.DurationMs,
+            }).ToList();
+        }
+
+        return result;
     }
 }

PlaylistShared.Pwa/Components/Common/TrackCoverWithPlay.razor

@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
 @using PlaylistShared.Shared.DTO
+@using PlaylistShared.Shared.Yandex
 @inject IAudioPlayerService AudioPlayerService
 
 <MudItem @onmouseenter="HandleMouseEnter"
@@ -11,7 +12,7 @@
     @if (CanPlay && (_isHovered || IsCurrentTrackPlaying))
     {
         <MudItem class="play-overlay"
-                  style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.6); display: flex; align-items: center; justify-content: center; border-radius: 4px;">
+                 style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.6); display: flex; align-items: center; justify-content: center; border-radius: 4px; transition: opacity 0.2s ease; cursor: pointer;">
             <MudIconButton Icon="@(IsCurrentTrackPlaying? Icons.Material.Filled.Pause : Icons.Material.Filled.PlayArrow)"
                            Color="Color.Inherit"
                            Size="Size.Large"

PlaylistShared.Pwa/Components/Common/TrackItem.razor

@@ -1,6 +1,7 @@
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Pwa.Components.Common
 @using PlaylistShared.Pwa.Extensions
+@using PlaylistShared.Shared.Yandex
 
 <MudStack Row AlignItems="AlignItems.Center">
     <!-- Обложка с фиксированной шириной -->
@@ -16,7 +17,7 @@
     <MudItem>
         <MudStack Spacing="0">
             <MudText Typo="Typo.body1" Color="Color.Secondary">@Track.Title</MudText>
-            <MudText Typo="Typo.body2" >@string.Join(", ", Track.Artists)</MudText>
+            <MudText Typo="Typo.body2" >@string.Join(", ", Track.Artists.Select(a => a.Name))</MudText>
         </MudStack>
     </MudItem>
 

PlaylistShared.Pwa/Components/Global/AudioPlayer.razor

@@ -53,7 +53,7 @@
                     </MudText>
 
                     <MudText Typo="Typo.body2" Style="font-weight: 600;">
-                        @if (AudioPlayerService.CurrentTrack != null) @string.Join(", ", AudioPlayerService.CurrentTrack.Artists)
+                        @if (AudioPlayerService.CurrentTrack != null) @string.Join(", ", AudioPlayerService.CurrentTrack.Artists.Select(a => a.Name))
                     </MudText>
                 </MudStack>
 

PlaylistShared.Pwa/Components/Global/TrackProgress.razor

@@ -2,7 +2,7 @@
 
 <div class="track-progress-container @ColorClass" 
      @onwheel="HandleWheel" 
-     style="--track-height: @(Height)px; height: @(Math.Max(Height, 24))px; --track-opacity: @(Opacity.ToString(System.Globalization.CultureInfo.InvariantCulture));">
+     style="--track-height: @(Height)px; height: @(Height)px; --track-opacity: @(Opacity.ToString(System.Globalization.CultureInfo.InvariantCulture));">
     
     <div class="progress-base-track">
         @if (Buffer)
@@ -24,6 +24,7 @@
            max="@Max.ToString(System.Globalization.CultureInfo.InvariantCulture)" 
            step="@Step.ToString(System.Globalization.CultureInfo.InvariantCulture)" 
            value="@Value.ToString(System.Globalization.CultureInfo.InvariantCulture)"
+           height="@Height"
            @oninput="OnInput"
            class="progress-input" />
 </div>

PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor

@@ -1,14 +1,16 @@
 @using PlaylistShared.Pwa.Components.Common
+@using PlaylistShared.Pwa.Components.SharedPlaylist.Cards
 @using PlaylistShared.Shared.DTO
 @using PlaylistShared.Shared.Enums
 @using PlaylistShared.Shared.SharedPlaylist
+@using PlaylistShared.Shared.Yandex
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 
 <MudStack Style="height: 100%; overflow: hidden;">
     <MudItem>
         <MudTextField @bind-Value="_searchQuery"
-                      @bind-Value:after="SearchTracks"
+                      @bind-Value:after="OnSearchQueryChanged"
                       Variant="Variant.Outlined"
                       FullWidth
                       Label="Название или ссылка на трек Яндекс.Музыки"
@@ -17,39 +19,100 @@
 
         <MudToggleGroup T="TrackSearchType"
                         @bind-Value="_searchType"
-                        @bind-Value:after="SearchTracks"
+                        @bind-Value:after="OnSearchTypeChanged"
                         Size="Size.Small"
                         Color="Color.Primary"
                         Disabled="@(_isSearching)">
             <MudToggleItem Value="TrackSearchType.All" Text="Все" />
-            <MudToggleItem Value="TrackSearchType.Track" Text="Трек" />
-            <MudToggleItem Value="TrackSearchType.Album" Text="Альбом" />
-            <MudToggleItem Value="TrackSearchType.Artist" Text="Исполнитель" />
+            <MudToggleItem Value="TrackSearchType.Track" Text="Треки" />
+            <MudToggleItem Value="TrackSearchType.Album" Text="Альбомы" />
+            <MudToggleItem Value="TrackSearchType.Playlist" Text="Плейлисты" />
+            <MudToggleItem Value="TrackSearchType.Artist" Text="Исполнители" />
         </MudToggleGroup>
     </MudItem>
 
-    <MudTable Items="@_searchResults"
-              Virtualize
-              Hover
-              Elevation="0"
-              Class="d-flex flex-grow-1 flex-column"
-              Style="min-height: 0;"
-              Breakpoint="Breakpoint.Sm"
-              Loading="@_isSearching">
-        <RowTemplate>
-            <MudTd Class="pa-1" Style="width: 100%;">
-                <TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
-            </MudTd>
-            <MudTd Class="pa-1">
-                <MudToggleIconButton Toggled="@ExistingTrackIds.Contains(context.TrackId)"
-                                     Icon="@Icons.Material.Filled.AddCircle"
-                                     Color="@Color.Primary"
-                                     ToggledIcon="@Icons.Material.Filled.RemoveCircle"
-                                     ToggledColor="@Color.Error"
-                                     ToggledChanged="() => ToggleTrack(context)" />
-            </MudTd>
-        </RowTemplate>
-    </MudTable>
+    <MudItem Style="overflow: auto; flex-grow:1;">
+        @if (_isSearching)
+        {
+            <MudProgressCircular Indeterminate Class="mx-auto my-8" />
+        }
+        else if (_searchResult != null)
+        {
+            <MudExpansionPanels>
+                @* Секция исполнителей *@
+                @if (_searchResult?.Artists != null)
+                {
+                    <MudExpansionPanel Text="Исполнители" Expanded="true">
+                        <MudGrid>
+                            @foreach (var artist in _searchResult.Artists)
+                            {
+                                <MudItem xs="12" sm="6" md="3" lg="2">
+                                    <ArtistCard Item="artist" OnClick="() => SearchTracksByEntity(artist.Id, artist.Name, TrackSearchType.Artist)" />
+                                </MudItem>
+                            }
+                        </MudGrid>
+                    </MudExpansionPanel>
+                }
+
+                @* Секция альбомов *@
+                @if (_searchResult?.Albums != null)
+                {
+                    <MudExpansionPanel Text="Альбомы" Expanded="true">
+                        <MudGrid>
+                            @foreach (var album in _searchResult.Albums)
+                            {
+                                <MudItem xs="12" sm="6" md="3" lg="2">
+                                    <AlbumCard Item="album" OnClick="() => SearchTracksByEntity(album.Id, album.Title, TrackSearchType.Album)" />
+                                </MudItem>
+                            }
+                        </MudGrid>
+                    </MudExpansionPanel>
+                }
+
+                @* Секция плейлистов *@
+                @if (_searchResult?.Playlists != null)
+                {
+                    <MudExpansionPanel Text="Плейлисты" Expanded="true">
+                        <MudGrid>
+                            @foreach (var playlist in _searchResult.Playlists)
+                            {
+                                <MudItem xs="12" sm="6" md="3" lg="2">
+                                    <PlaylistCard Item="playlist" OnClick="() => SearchTracksByEntity(playlist.Uuid, playlist.Title, TrackSearchType.Playlist)" />
+                                </MudItem>
+                            }
+                        </MudGrid>
+                    </MudExpansionPanel>
+                }
+
+                @* Секция треков *@
+                @if (_searchResult?.Tracks != null)
+                {
+                    <MudExpansionPanel Text="Треки" Expanded="true">
+                        <MudTable Items="@_searchResult.Tracks"
+                                    Hover
+                                    Elevation="0"
+                                    Class="d-flex flex-grow-1 flex-column"
+                                    Style="min-height: 0;"
+                                    Breakpoint="Breakpoint.Sm">
+                            <RowTemplate>
+                                <MudTd Class="pa-1" Style="width: 100%;">
+                                    <TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
+                                </MudTd>
+                                <MudTd Class="pa-1">
+                                    <MudToggleIconButton Toggled="@ExistingTrackIds.Contains(context.TrackId)"
+                                                            Icon="@Icons.Material.Filled.AddCircle"
+                                                            Color="@Color.Primary"
+                                                            ToggledIcon="@Icons.Material.Filled.RemoveCircle"
+                                                            ToggledColor="@Color.Error"
+                                                            ToggledChanged="() => ToggleTrack(context)" />
+                                </MudTd>
+                            </RowTemplate>
+                        </MudTable>
+                    </MudExpansionPanel>
+                }
+            </MudExpansionPanels>
+        }
+    </MudItem>
 </MudStack>
 
 @code {
@@ -60,22 +123,32 @@
 
     private string _searchQuery = "";
     private bool _isSearching = false;
-    private bool _isFirstSearch = true;
     private TrackSearchType _searchType = TrackSearchType.All;
-    private List<YandexTrack> _searchResults = new();
+    private YandexSearchResult? _searchResult = null;
 
-    private async Task SearchTracks()
+    private async Task OnSearchQueryChanged()
     {
-        if (string.IsNullOrWhiteSpace(_searchQuery))
+        await SearchTracks(byId: false);
+    }
+
+    private async Task OnSearchTypeChanged()
+    {
+        await SearchTracks(byId: false);
+    }
+
+    private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
+    {
+        var query = forcedQuery ?? _searchQuery;
+        if (string.IsNullOrWhiteSpace(query))
         {
+            _searchResult = null;
             return;
         }
 
-        var query = _searchQuery.Trim();
         var type = _searchType;
-        bool byId = false;
 
-        if (Uri.TryCreate(_searchQuery, UriKind.Absolute, out var uri) && uri.Host == "music.yandex.ru")
+        // Распознавание ссылки Яндекс.Музыки
+        if (!byId && Uri.TryCreate(query, UriKind.Absolute, out var uri) && uri.Host == "music.yandex.ru")
         {
             try
             {
@@ -89,58 +162,61 @@
             }
         }
 
-        _isFirstSearch = false;
         _isSearching = true;
+        _searchResult = null;
+        StateHasChanged();
+
         try
         {
-            var url = $"/api/yandexsearch/tracks?query={Uri.EscapeDataString(query)}&searchType={Uri.EscapeDataString(type.ToString())}&limit=20";
+            var url = $"/api/yandexsearch/search?query={Uri.EscapeDataString(query)}&searchType={Uri.EscapeDataString(type.ToString())}&limit=20";
+            if (byId)
+                url += "&byId=true";
             if (!string.IsNullOrEmpty(ShareToken))
                 url += $"&shared_id={Uri.EscapeDataString(ShareToken)}";
-            if (byId)
-                url += $"&byId={byId}";
 
-            var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexTrack>>>(url);
+            var response = await Http.GetFromJsonAsync<ApiResponse<YandexSearchResult>>(url);
             if (response?.Success == true)
-                _searchResults = response.Data ?? new();
+            {
+                _searchResult = response.Data ?? new YandexSearchResult();
+            }
             else
+            {
                 Snackbar.Add(response?.Error?.Message ?? "Ошибка поиска", Severity.Error);
+                _searchResult = null;
+            }
         }
         catch (Exception ex)
         {
             Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
+            _searchResult = null;
         }
         finally
         {
             _isSearching = false;
             StateHasChanged();
         }
-
     }
 
-    private async Task SearchTracksByQuery(string query)
+    private async Task SearchTracksByEntity(string entityId, string title, TrackSearchType entityType)
     {
-        if (string.IsNullOrWhiteSpace(query))
-            return;
-
+        // Переключаем тип и ищем по ID
+        _searchType = entityType;
+        _searchQuery = title;
+        await SearchTracks(byId: true, forcedQuery: entityId);
     }
 
     private async Task ToggleTrack(YandexTrack track)
     {
         if (ExistingTrackIds.Contains(track.TrackId))
-        {
             await RemoveTrack(track);
-        }
         else
-        {
             await AddTrack(track);
-        }
     }
 
     private async Task RemoveTrack(YandexTrack track)
     {
         if (!ExistingTrackIds.Remove(track.TrackId)) return;
 
-
         try
         {
             await RemoveTrackById(track.TrackId);
@@ -164,7 +240,7 @@
         var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
         if (response.IsSuccessStatusCode)
         {
-            await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
+            await OnTrackAdded.InvokeAsync();
         }
         else
         {
@@ -201,7 +277,7 @@
         var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/add-tracks", request);
         if (response.IsSuccessStatusCode)
         {
-            await OnTrackAdded.InvokeAsync(); // уведомляем родителя, что список треков изменился
+            await OnTrackAdded.InvokeAsync();
         }
         else
         {

PlaylistShared.Pwa/Components/SharedPlaylist/Cards/AlbumCard.razor

@@ -0,0 +1,34 @@
+@using PlaylistShared.Shared.Yandex
+
+<MudItem Class="d-flex flex-column align-center pa-2 cursor-pointer" @onclick="HandleClick">
+    @if (!string.IsNullOrEmpty(Item.CoverUrl))
+    {
+        <MudAvatar Size="MudBlazor.Size.Large">
+            <MudImage Src="@Item.CoverUrl.FormatCoverUrl(Size, Size)" />
+        </MudAvatar>
+    }
+    else
+    {
+        <MudAvatar Size="MudBlazor.Size.Large" Variant="Variant.Filled">
+            <MudIcon Icon="@Icons.Material.Filled.AccountCircle" />
+        </MudAvatar>
+    }
+    <MudText Typo="Typo.body2" Align="Align.Center" Class="mt-2">@Item.Title</MudText>
+    <MudText Typo="Typo.caption" Align="Align.Center" Color="Color.Secondary">
+        @string.Join(", ", Item.Artists.Select(a => a.Name))
+    </MudText>
+</MudItem>
+
+@code {
+    [Parameter] public YandexAlbum Item { get; set; } = null!;
+    [Parameter] public EventCallback OnClick { get; set; }
+    [Parameter] public int Size { get; set; } = 50;
+
+    private async Task HandleClick()
+    {
+        if (OnClick.HasDelegate)
+        {
+            await OnClick.InvokeAsync();
+        }
+    }
+}

PlaylistShared.Pwa/Components/SharedPlaylist/Cards/ArtistCard.razor

@@ -0,0 +1,31 @@
+@using PlaylistShared.Shared.Yandex
+
+<MudItem Class="d-flex flex-column align-center pa-2 cursor-pointer" @onclick="HandleClick">
+    @if (!string.IsNullOrEmpty(Item.CoverUrl))
+    {
+        <MudAvatar Size="MudBlazor.Size.Large">
+            <MudImage Src="@Item.CoverUrl.FormatCoverUrl(Size, Size)" />
+        </MudAvatar>
+    }
+    else
+    {
+        <MudAvatar Size="MudBlazor.Size.Large" Variant="Variant.Filled">
+            <MudIcon Icon="@Icons.Material.Filled.Album" />
+        </MudAvatar>
+    }
+    <MudText Typo="Typo.body2" Align="Align.Center" Class="mt-2">@Item.Name</MudText>
+</MudItem>
+
+@code {
+    [Parameter] public YandexArtist Item { get; set; } = null!;
+    [Parameter] public EventCallback OnClick { get; set; }
+    [Parameter] public int Size { get; set; } = 50;
+
+    private async Task HandleClick()
+    {
+        if (OnClick.HasDelegate)
+        {
+            await OnClick.InvokeAsync();
+        }
+    }
+}

PlaylistShared.Pwa/Components/SharedPlaylist/Cards/PlaylistCard.razor

@@ -0,0 +1,31 @@
+@using PlaylistShared.Shared.Yandex
+
+<MudItem Class="d-flex flex-column align-center pa-2 cursor-pointer" @onclick="HandleClick">
+    @if (!string.IsNullOrEmpty(Item.CoverUrl))
+    {
+        <MudAvatar Size="MudBlazor.Size.Large">
+            <MudImage Src="@Item.CoverUrl.FormatCoverUrl(Size, Size)" />
+        </MudAvatar>
+    }
+    else
+    {
+        <MudAvatar Size="MudBlazor.Size.Large" Variant="Variant.Filled">
+            <MudIcon Icon="@Icons.Material.Filled.PlaylistPlay" />
+        </MudAvatar>
+    }
+    <MudText Typo="Typo.body2" Align="Align.Center" Class="mt-2">@Item.Title</MudText>
+</MudItem>
+
+@code {
+    [Parameter] public YandexPlaylist Item { get; set; } = null!;
+    [Parameter] public EventCallback OnClick { get; set; }
+    [Parameter] public int Size { get; set; } = 50;
+
+    private async Task HandleClick()
+    {
+        if (OnClick.HasDelegate)
+        {
+            await OnClick.InvokeAsync();
+        }
+    }
+}

PlaylistShared.Pwa/Pages/MyPlaylists.razor

@@ -3,7 +3,8 @@
 
 @attribute [Authorize]
 @using PlaylistShared.Shared.DTO
-@using PlaylistShared.Shared.Playlist
+@using PlaylistShared.Shared.SharedPlaylist
+@using PlaylistShared.Shared.Yandex
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation
@@ -70,11 +71,11 @@
 </MudContainer>
 
 @code {
-    private List<YandexPlaylistInfo> _playlists;
+    private List<YandexPlaylistShare> _playlists;
     private bool _loading = true;
     private bool _showOnlyShared = false;
 
-    private List<YandexPlaylistInfo> FilteredPlaylists => _showOnlyShared ? _playlists?.Where(p => p.IsShared).ToList() : _playlists;
+    private List<YandexPlaylistShare> FilteredPlaylists => _showOnlyShared ? _playlists?.Where(p => p.IsShared).ToList() : _playlists;
 
     protected override async Task OnInitializedAsync()
     {
@@ -86,7 +87,7 @@
         _loading = true;
         try
         {
-            var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexPlaylistInfo>>>("/api/playlists");
+            var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexPlaylistShare>>>("/api/playlists");
             if (response?.Success == true)
                 _playlists = response.Data;
             else
@@ -103,7 +104,7 @@
         }
     }
 
-    private async Task SharePlaylist(YandexPlaylistInfo playlist)
+    private async Task SharePlaylist(YandexPlaylistShare playlist)
     {
         var request = new SharePlaylistRequest { Kind = playlist.Kind, OwnerUid = playlist.OwnerUid };
         var response = await Http.PostAsJsonAsync("/api/playlists/share", request);
@@ -118,7 +119,7 @@
         }
     }
     
-    private void GoToShared(YandexPlaylistInfo playlist)
+    private void GoToShared(YandexPlaylistShare playlist)
     {
         if (!string.IsNullOrEmpty(playlist.ShareToken))
             Navigation.NavigateTo($"/shared/{playlist.ShareToken}");

PlaylistShared.Pwa/Pages/SharedPlaylistView.razor

@@ -7,6 +7,7 @@
 @using PlaylistShared.Shared.Enums
 @using PlaylistShared.Pwa.Services
 @using PlaylistShared.Shared.SharedPlaylist
+@using PlaylistShared.Shared.Yandex
 @inject HttpClient Http
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation

PlaylistShared.Pwa/Services/Api/SharedPlaylistClient.cs

@@ -1,5 +1,6 @@
 using PlaylistShared.Shared;
 using PlaylistShared.Shared.SharedPlaylist;
+using PlaylistShared.Shared.Yandex;
 using System.Net.Http.Json;
 
 namespace PlaylistShared.Pwa.Services.Api;

PlaylistShared.Pwa/Services/AudioPlayerService.cs

@@ -1,6 +1,6 @@
 using MudBlazor;
 using PlaylistShared.Shared;
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared.Yandex;
 using System.Net.Http.Json;
 
 namespace PlaylistShared.Pwa.Services;

PlaylistShared.Pwa/Services/IAudioPlayerService.cs

@@ -1,4 +1,4 @@
-using PlaylistShared.Shared.DTO;
+using PlaylistShared.Shared.Yandex;
 
 namespace PlaylistShared.Pwa.Services;
 

PlaylistShared.Pwa/wwwroot/css/app.css

@@ -109,41 +109,19 @@ code {
     text-align: start;
 }
 
-.track-cover-container {
-    border-radius: 4px;
-    overflow: hidden;
-    transition: transform 0.2s ease;
+/* Горизонтальный скролинг */
+.horizontal-scroll {
+    overflow-x: auto;
+    scroll-snap-type: x mandatory;
+    overflow-y: hidden; /* отключаем вертикальный скролл */
+    cursor: grab;
 }
 
-    .track-cover-container:hover {
-        transform: scale(1.05);
-    }
-
-.play-overlay {
-    transition: opacity 0.2s ease;
-    cursor: pointer;
-}
-
-/* Фиксированный плеер внизу */
-.fixed-player {
-    position: sticky;
-    display: flex;
-    bottom: 0;
-    width: 100%;
-    right: 0;
-    justify-content: center;
-    background-color: var(--mud-palette-background);
-    box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1);
-}
-
-/* Отступ снизу, когда плеер виден */
-.page-with-player {
-    padding-bottom: 80px; /* Высота плеера (подберите под свою тему) */
-}
-
-/* На мобильных устройствах можно уменьшить отступ */
-@media (max-width: 600px) {
-    .page-with-player {
-        padding-bottom: 100px; /* если плеер выше на мобильных */
+    .horizontal-scroll:active {
+        cursor: grabbing;
     }
+/* Для WebKit (Chrome, Edge, Safari) можно включить горизонтальный скролл мышью */
+.horizontal-scroll {
+    scrollbar-width: thin;
+    -webkit-overflow-scrolling: touch;
 }

PlaylistShared.Shared/SharedPlaylist/SharePlaylistDto.cs

@@ -1,7 +1,7 @@
 using PlaylistShared.Shared.Enums;
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.SharedPlaylist;
 
 /// <summary>Запрос на создание нового шеринг-плейлиста.</summary>
 public class SharePlaylistDto

PlaylistShared.Shared/SharedPlaylist/SharePlaylistRequest.cs

@@ -1,4 +1,4 @@
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.SharedPlaylist;
 
 public class SharePlaylistRequest
 {

PlaylistShared.Shared/Yandex/YandexAlbum.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о альбоме из Яндекс.Музыки.</summary>
+public class YandexAlbum
+{
+    /// <summary>Идентификатор альбома (id).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = null!;
+
+    /// <summary>Наименование альбома.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = null!;
+
+    /// <summary>Исполнители альбома.</summary>
+    [JsonPropertyName("artists")]
+    public List<YandexArtist> Artists { get; set; } = null!;
+
+    /// <summary>Описание альбома.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>URL обложки альбома.</summary>
+    [JsonPropertyName("coverUrl")]
+    public string? CoverUrl { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexArtist.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о исполнителе из Яндекс.Музыки.</summary>
+public class YandexArtist
+{
+    /// <summary>Идентификатор исполнителя (id).</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = null!;
+
+    /// <summary>Наименование исполнителя.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = null!;
+
+    /// <summary>Описание исполнителя.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>URL исполнителя.</summary>
+    [JsonPropertyName("coverUrl")]
+    public string? CoverUrl { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexPlaylist.cs

@@ -1,10 +1,14 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.Playlist;
+namespace PlaylistShared.Shared.Yandex;
 
-/// <summary>Информация о плейлисте из Яндекс.Музыки (для импорта).</summary>
-public class YandexPlaylistInfo
+/// <summary>Информация о плейлисте из Яндекс.Музыки.</summary>
+public class YandexPlaylist
 {
+    /// <summary>Идентификатор плейлиста (uuid).</summary>
+    [JsonPropertyName("uuid")]
+    public string Uuid { get; set; } = null!;
+
     /// <summary>Идентификатор плейлиста (kind).</summary>
     [JsonPropertyName("kind")]
     public string Kind { get; set; } = null!;
@@ -28,12 +32,4 @@ public class YandexPlaylistInfo
     /// <summary>Кол-во треков.</summary>
     [JsonPropertyName("trackCount")]
     public int TrackCount { get; set; }
-
-    /// <summary>Расшаренный</summary>
-    [JsonPropertyName("isShared")]
-    public bool IsShared { get; set; }
-
-    /// <summary>Расшаренная ссылка</summary>
-    [JsonPropertyName("shareToken")]
-    public string? ShareToken { get; set; }
 }

PlaylistShared.Shared/Yandex/YandexPlaylistData.cs

@@ -1,6 +1,4 @@
-using PlaylistShared.Shared.DTO;
-
-namespace PlaylistShared.Shared.SharedPlaylist;
+namespace PlaylistShared.Shared.Yandex;
 
 public class YandexPlaylistData
 {

PlaylistShared.Shared/Yandex/YandexPlaylistShare.cs

@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о плейлисте из Яндекс.Музыки с пометкой о шаринге.</summary>
+public class YandexPlaylistShare : YandexPlaylist
+{
+
+    /// <summary>Расшаренный</summary>
+    [JsonPropertyName("isShared")]
+    public bool IsShared { get; set; }
+
+    /// <summary>Расшаренная ссылка</summary>
+    [JsonPropertyName("shareToken")]
+    public string? ShareToken { get; set; }
+}

PlaylistShared.Shared/Yandex/YandexSearchResult.cs

@@ -0,0 +1,31 @@
+using System.Text.Json.Serialization;
+
+namespace PlaylistShared.Shared.Yandex;
+
+/// <summary>Информация о плейлисте из Яндекс.Музыки (для импорта).</summary>
+public class YandexSearchResult
+{
+    /// <summary>
+    /// Найденные треки.
+    /// </summary>
+    [JsonPropertyName("tracks")]
+    public List<YandexTrack>? Tracks { get; set; } = null;
+
+    /// <summary>
+    /// Найденные плейлисты.
+    /// </summary>
+    [JsonPropertyName("playlists")]
+    public List<YandexPlaylist>? Playlists { get; set; } = null;
+
+    /// <summary>
+    /// Найденные исполнители.
+    /// </summary>
+    [JsonPropertyName("artists")]
+    public List<YandexArtist>? Artists { get; set; } = null;
+
+    /// <summary>
+    /// Найденные альбомы.
+    /// </summary>
+    [JsonPropertyName("albumns")]
+    public List<YandexAlbum>? Albums { get; set; } = null;
+}

PlaylistShared.Shared/Yandex/YandexTrack.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace PlaylistShared.Shared.DTO;
+namespace PlaylistShared.Shared.Yandex;
 
 /// <summary>Результат поиска трека в Яндекс.Музыке.</summary>
 public class YandexTrack
@@ -12,7 +12,7 @@ public class YandexTrack
     public string Title { get; set; } = string.Empty;
 
     [JsonPropertyName("artists")]
-    public List<string> Artists { get; set; } = new();
+    public List<YandexArtist> Artists { get; set; } = new();
 
     [JsonPropertyName("coverUri")]
     public string CoverUri { get; set; } = string.Empty;