Добавлен прокрутка группы поиска

Добавлен пункт "мои плейлисты"
2026-04-23 18:16:08 +03:00 · 2026-04-23 18:05:07 +03:00
7 changed files with 178 additions and 38 deletions
--- a/PlaylistShared.Api/Controllers/YandexSearchController.cs
+++ b/PlaylistShared.Api/Controllers/YandexSearchController.cs
@@ -28,13 +28,13 @@ public class YandexSearchController : ControllerBase

    [HttpGet("search")]
    public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
-        [FromQuery] string query,
-        [FromQuery] int limit = 20,
+        [FromQuery] string query = "",
+        [FromQuery] int limit = 40,
        [FromQuery] TrackSearchType searchType = TrackSearchType.All,
        [FromQuery] bool byId = false,
        [FromQuery] string? shared_id = null)
    {
-        if (string.IsNullOrWhiteSpace(query))
+        if (string.IsNullOrWhiteSpace(query) && searchType != TrackSearchType.MyPlaylists)
            return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
            {
                StatusCode = 400,
@@ -46,6 +46,8 @@ public class YandexSearchController : ControllerBase
        if (userId.HasValue)
            user = await _userManager.FindByIdAsync(userId.Value.ToString());

+        var byShareId = false;
+
        // Если нет пользователя или у него нет токена, пробуем через shared_id
        if (user == null || string.IsNullOrEmpty(user.YandexAccessToken))
        {
@@ -61,6 +63,8 @@ public class YandexSearchController : ControllerBase
            var owner = await _userManager.FindByIdAsync(playlist.CreatorUserId.ToString());
            if (owner == null) return StatusCode(500, "Не удалось найти владельца плейлиста.");
            user = owner;
+
+            byShareId = true;
        }

        if (string.IsNullOrEmpty(user.YandexAccessToken))
@@ -74,7 +78,16 @@ public class YandexSearchController : ControllerBase

        if (byId)
        {
-            results = await _yandexService.SearchTracksByIdAsync(user, query, searchType, limit);
+            results = await _yandexService.SearchTracksByIdAsync(user, query, searchType);
+        }
+        else if (searchType == TrackSearchType.MyPlaylists)
+        {
+            if (byShareId)
+            {
+                return Unauthorized("Необходимо подключение профиля к яндекс музыке.");
+            }
+
+            results = await _yandexService.SearchMyPlaylists(user);
        }
        else
        {
--- a/PlaylistShared.Api/PlaylistShared.Api.csproj
+++ b/PlaylistShared.Api/PlaylistShared.Api.csproj
@@ -10,24 +10,24 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<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="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
 		<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.6">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.6" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.7" />
 		<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.15" />
+		<PackageReference Include="YandexMusic" Version="0.0.16" />
 	</ItemGroup>

 	<ItemGroup>
--- a/PlaylistShared.Api/Services/Yandex/YandexMusicService.cs
+++ b/PlaylistShared.Api/Services/Yandex/YandexMusicService.cs
@@ -161,11 +161,56 @@ public class YandexMusicService
        };
    }

+    public async Task<YandexSearchResult> SearchMyPlaylists(ApplicationUser user)
+    {
+        YandexSearchResult result = new();
+
+        await AuthorizeIfNot(user);
+
+
+        var favoritesPlaylist = await Api.Playlist.FavoritesAsync();
+        result.Playlists = favoritesPlaylist?.Select(t => new YandexPlaylist
+        {
+            Uuid = t.PlaylistUuid,
+            Kind = t.Kind,
+            OwnerUid = t.Owner?.Uid ?? string.Empty,
+            Title = t.Title,
+            Description = t.Description,
+            CoverUrl = t.Cover.GetUrl(),
+            TrackCount = t.TrackCount,
+        }).ToList();
+
+        var personalPlaylists = await Api.Playlist.GetPersonalPlaylistsAsync();
+        result.PersonalPlaylists = personalPlaylists?.Select(t => new YandexPlaylist
+        {
+            Uuid = t.PlaylistUuid,
+            Kind = t.Kind,
+            OwnerUid = t.Owner?.Uid ?? string.Empty,
+            Title = t.Title,
+            Description = t.Description,
+            CoverUrl = t.Cover.GetUrl(),
+            TrackCount = t.TrackCount,
+        }).ToList();
+
+        var likedPlaylists = (await Api.Library.GetLikedPlaylistsAsync())?.Select(t => t.Playlist).ToList();
+        result.LikedPlaylists = likedPlaylists?.Select(t => new YandexPlaylist
+        {
+            Uuid = t.PlaylistUuid,
+            Kind = t.Kind,
+            OwnerUid = t.Owner?.Uid ?? string.Empty,
+            Title = t.Title,
+            Description = t.Description,
+            CoverUrl = t.Cover.GetUrl(),
+            TrackCount = t.TrackCount,
+        }).ToList();
+
+        return result;
+    }
+
    public async Task<YandexSearchResult> SearchTracksByIdAsync(
        ApplicationUser user,
        string id,
-        TrackSearchType searchType,
-        int limit = 20
+        TrackSearchType searchType
        )
    {
        YandexSearchResult result = new();
@@ -254,8 +299,8 @@ public class YandexMusicService
                    TrackCount = p.TrackCount,
                }).ToList();

-
-                result.Tracks = artist.PopularTracks.Select(t => new YandexTrack
+                var allTraks = await artist.Artist.GetAllTracksAsync();
+                result.Tracks = allTraks?.Select(t => new YandexTrack
                {
                    TrackId = t.Id,
                    Title = t.Title,
--- a/PlaylistShared.Pwa/Pages/Login.razor
+++ b/PlaylistShared.Pwa/Pages/Login.razor
@@ -11,7 +11,7 @@
    <MudCard>
        <MudCardContent Class="text-center">
            <MudText Typo="Typo.h5" Class="mb-4">Вход в PlaylistShared</MudText>
-
+            @*
            <MudText Typo="Typo.body2" Class="mb-6">
                Войдите через учётную запись Keycloak или используйте локальный аккаунт.
            </MudText>
@@ -22,7 +22,7 @@
            </MudButton>

            <MudDivider Class="my-4">или</MudDivider>
-
+            *@
            <!-- Локальная форма входа -->
            <MudTextField @bind-Value="_loginModel.Username" Label="Имя пользователя" Variant="Variant.Outlined" FullWidth="true" Class="mb-3" />
            <MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" @bind-Value:after="LocalLogin" />
--- a/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor
+++ b/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor
@@ -8,6 +8,7 @@
@using PlaylistShared.Shared.DTO
@using PlaylistShared.Shared.Enums
@using PlaylistShared.Pwa.Services
+@using PlaylistShared.Shared.Profile
@using PlaylistShared.Shared.SharedPlaylist
@using PlaylistShared.Shared.Yandex
@inject HttpClient Http
@@ -17,7 +18,6 @@
@inject IDialogService DialogService
@inject IAudioPlayerService AudioPlayerService
@inject IJSRuntime JS
-@inject IDialogService DialogService
@implements IDisposable

 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1 px-1" Style="height: 100%;">
@@ -232,7 +232,7 @@
    {
        <MudCard Class="d-flex flex-column" Elevation="0" Style="height: 100%;">
            <MudCardHeader Class="pb-0">
-                <MudStack Style="width: 100%;" Spacing="0">
+                <MudStack Style="width: 100%;">
                    <MudText Typo="Typo.h6" Color="Color.Primary" Class="mb-4">Добавление треков</MudText>
                    <MudTextField @bind-Value="_searchQuery"
                                  @bind-Value:after="OnSearchQueryChanged"
@@ -242,19 +242,23 @@
                                  Label="Название или ссылка на трек"
                                  Disabled="@_isSearching"
                                  Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
-
+                    <div class="horizontal-scroll-container">
                        <MudToggleGroup T="TrackSearchType"
                                        @bind-Value="_searchType"
                                        @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.Playlist" Text="Плейлисты" />
-                        <MudToggleItem Value="TrackSearchType.Artist" Text="Исполнители" />
+                                        Disabled="@(_isSearching)"
+                                        Class="pt-2"
+                                        Style="display: inline-flex; flex-wrap: nowrap;">
+                            <MudToggleItem Value="TrackSearchType.All" Class="px-2" Text="Все" />
+                            <MudToggleItem Value="TrackSearchType.Track" Class="px-2" Text="Треки" />
+                            <MudToggleItem Value="TrackSearchType.Album" Class="px-2" Text="Альбомы" />
+                            <MudToggleItem Value="TrackSearchType.Playlist" Class="px-2" Text="Плейлисты" />
+                            <MudToggleItem Value="TrackSearchType.Artist" Class="px-2" Text="Исполнители" />
+                            <MudToggleItem Value="TrackSearchType.MyPlaylists" Class="px-2" Text="Мои плейлисты" />
                        </MudToggleGroup>
+                    </div>
                </MudStack>
            </MudCardHeader>

@@ -328,6 +332,34 @@
                        </div>
                    }

+                    @* Секция персональных плейлистов *@
+                    @if (_searchResult?.PersonalPlaylists?.Any() == true)
+                    {
+                        <MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Плейлисты (персональные)</MudText>
+                        <div class="horizontal-scroll-container px-2">
+                            @foreach (var playlist in _searchResult.PersonalPlaylists)
+                            {
+                                <div style="width: 70px;">
+                                    <PlaylistCard Item="playlist" OnClick="() => SearchTracksByEntity(playlist.Uuid, playlist.Title, TrackSearchType.Playlist)" />
+                                </div>
+                            }
+                        </div>
+                    }
+
+                    @* Секция лайкнутых плейлистов *@
+                    @if (_searchResult?.LikedPlaylists?.Any() == true)
+                    {
+                        <MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Плейлисты (лайки)</MudText>
+                        <div class="horizontal-scroll-container px-2">
+                            @foreach (var playlist in _searchResult.LikedPlaylists)
+                            {
+                                <div style="width: 70px;">
+                                    <PlaylistCard Item="playlist" OnClick="() => SearchTracksByEntity(playlist.Uuid, playlist.Title, TrackSearchType.Playlist)" />
+                                </div>
+                            }
+                        </div>
+                    }
+
                    @* Секция треков *@
                    @if (_searchResult?.Tracks != null)
                    {
@@ -640,13 +672,50 @@
    private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
    {
        var query = forcedQuery ?? _searchQuery;
-        if (string.IsNullOrWhiteSpace(query))
+        var type = _searchType;
+        
+
+        //Если поиск в моих плейлистах
+        if (type == TrackSearchType.MyPlaylists)
+        {
+            var showMessage = true;
+
+            if (_isAuthenticated)
+            {
+                var response = await Http.GetFromJsonAsync<ApiResponse<YandexTokenStatus>>("/api/yandexaccount/status");
+                if (response?.Success == true)
+                {
+                    var hasToken = response?.Data?.HasToken ?? false;
+
+                    if (hasToken) showMessage = false;
+                }
+            }
+
+            if (showMessage)
+            {
+                var response = await DialogService.ShowMessageBoxAsync(new()
+                    {
+                        Title = "Необходимо авторизация",
+                        Message = "Для использования \"Мои плейлисты\" необходима авторизация в яндекс музыке.",
+                        YesText = "Авторизоваться",
+                        CancelText = "Отмена",
+                    });
+
+                if (response == true)
+                {
+                    Navigation.NavigateTo("/login");
+                }
+
+                return;
+            }
+        }
+        //Если обычный поиск, нужен текст
+        else if (string.IsNullOrWhiteSpace(query))
        {
            _searchResult = null;
            return;
        }

-        var type = _searchType;

        // Распознавание ссылки Яндекс.Музыки
        if (!byId && Uri.TryCreate(query, UriKind.Absolute, out var uri) && uri.Host == "music.yandex.ru")
@@ -671,7 +740,7 @@

        try
        {
-            var url = $"/api/yandexsearch/search?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())}";
            if (byId)
                url += "&byId=true";
            if (!string.IsNullOrEmpty(Token))
--- a/PlaylistShared.Shared/Enums/TrackSearchType.cs
+++ b/PlaylistShared.Shared/Enums/TrackSearchType.cs
@@ -13,4 +13,5 @@ public enum TrackSearchType
    Album,
    Playlist,
    Track,
+    MyPlaylists,
 }
--- a/PlaylistShared.Shared/Yandex/YandexSearchResult.cs
+++ b/PlaylistShared.Shared/Yandex/YandexSearchResult.cs
@@ -17,6 +17,18 @@ public class YandexSearchResult
    [JsonPropertyName("playlists")]
    public List<YandexPlaylist>? Playlists { get; set; } = null;

+    /// <summary>
+    /// Персональные плейлисты.
+    /// </summary>
+    [JsonPropertyName("personalPlaylists")]
+    public List<YandexPlaylist>? PersonalPlaylists { get; set; } = null;
+
+    /// <summary>
+    /// Плейлисты, которые понравились.
+    /// </summary>
+    [JsonPropertyName("likedPlaylists")]
+    public List<YandexPlaylist>? LikedPlaylists { get; set; } = null;
+
    /// <summary>
    /// Найденные исполнители.
    /// </summary>
Author	SHA1	Message	Date
FrigaT	78808ea525	Добавлен прокрутка группы поиска	2026-04-23 18:16:08 +03:00
FrigaT	d6da8460cc	Добавлен пункт "мои плейлисты"	2026-04-23 18:05:07 +03:00