Compare commits
8 Commits
362762a813
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38af6174fa | ||
|
|
2fe20c804a | ||
|
|
3c83a83396 | ||
|
|
14fcd7dff9 | ||
|
|
ecb12a7d4a | ||
|
|
2cd80c8082 | ||
|
|
78808ea525 | ||
|
|
d6da8460cc |
@@ -28,13 +28,13 @@ public class YandexSearchController : ControllerBase
|
|||||||
|
|
||||||
[HttpGet("search")]
|
[HttpGet("search")]
|
||||||
public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
|
public async Task<ActionResult<ApiResponse<YandexSearchResult>>> SearchQuery(
|
||||||
[FromQuery] string query,
|
[FromQuery] string query = "",
|
||||||
[FromQuery] int limit = 20,
|
[FromQuery] int limit = 40,
|
||||||
[FromQuery] TrackSearchType searchType = TrackSearchType.All,
|
[FromQuery] TrackSearchType searchType = TrackSearchType.All,
|
||||||
[FromQuery] bool byId = false,
|
[FromQuery] bool byId = false,
|
||||||
[FromQuery] string? shared_id = null)
|
[FromQuery] string? shared_id = null)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(query))
|
if (string.IsNullOrWhiteSpace(query) && searchType != TrackSearchType.MyPlaylists)
|
||||||
return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
|
return BadRequest(ApiResponse<YandexSearchResult>.Fail(new ErrorResponse
|
||||||
{
|
{
|
||||||
StatusCode = 400,
|
StatusCode = 400,
|
||||||
@@ -46,6 +46,8 @@ public class YandexSearchController : ControllerBase
|
|||||||
if (userId.HasValue)
|
if (userId.HasValue)
|
||||||
user = await _userManager.FindByIdAsync(userId.Value.ToString());
|
user = await _userManager.FindByIdAsync(userId.Value.ToString());
|
||||||
|
|
||||||
|
var byShareId = false;
|
||||||
|
|
||||||
// Если нет пользователя или у него нет токена, пробуем через shared_id
|
// Если нет пользователя или у него нет токена, пробуем через shared_id
|
||||||
if (user == null || string.IsNullOrEmpty(user.YandexAccessToken))
|
if (user == null || string.IsNullOrEmpty(user.YandexAccessToken))
|
||||||
{
|
{
|
||||||
@@ -61,6 +63,8 @@ public class YandexSearchController : ControllerBase
|
|||||||
var owner = await _userManager.FindByIdAsync(playlist.CreatorUserId.ToString());
|
var owner = await _userManager.FindByIdAsync(playlist.CreatorUserId.ToString());
|
||||||
if (owner == null) return StatusCode(500, "Не удалось найти владельца плейлиста.");
|
if (owner == null) return StatusCode(500, "Не удалось найти владельца плейлиста.");
|
||||||
user = owner;
|
user = owner;
|
||||||
|
|
||||||
|
byShareId = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(user.YandexAccessToken))
|
if (string.IsNullOrEmpty(user.YandexAccessToken))
|
||||||
@@ -74,7 +78,16 @@ public class YandexSearchController : ControllerBase
|
|||||||
|
|
||||||
if (byId)
|
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
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,24 +10,24 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
|
||||||
<PackageReference Include="AspNet.Security.OAuth.Yandex" Version="10.0.0" />
|
<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>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.7" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" 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>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -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(
|
public async Task<YandexSearchResult> SearchTracksByIdAsync(
|
||||||
ApplicationUser user,
|
ApplicationUser user,
|
||||||
string id,
|
string id,
|
||||||
TrackSearchType searchType,
|
TrackSearchType searchType
|
||||||
int limit = 20
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
YandexSearchResult result = new();
|
YandexSearchResult result = new();
|
||||||
@@ -254,8 +299,8 @@ public class YandexMusicService
|
|||||||
TrackCount = p.TrackCount,
|
TrackCount = p.TrackCount,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
|
var allTraks = await artist.Artist.GetAllTracksAsync();
|
||||||
result.Tracks = artist.PopularTracks.Select(t => new YandexTrack
|
result.Tracks = allTraks?.Select(t => new YandexTrack
|
||||||
{
|
{
|
||||||
TrackId = t.Id,
|
TrackId = t.Id,
|
||||||
Title = t.Title,
|
Title = t.Title,
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
@inject AuthenticationStateProvider AuthProvider
|
@inject AuthenticationStateProvider AuthProvider
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject HttpClient Http
|
@inject HttpClient Http
|
||||||
|
@implements IDisposable
|
||||||
|
@implements IAsyncDisposable
|
||||||
|
|
||||||
<MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap">
|
<MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap">
|
||||||
<!-- Кнопки управления -->
|
<!-- Кнопки управления -->
|
||||||
@@ -291,6 +293,13 @@
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
AudioPlayerService.OnLoadAndPlayRequested -= OnServiceLoadAndPlay;
|
||||||
|
AudioPlayerService.OnPlayRequested -= OnServicePlay;
|
||||||
|
AudioPlayerService.OnPauseRequested -= OnServicePause;
|
||||||
|
AudioPlayerService.OnSeekRequested -= OnServiceSeek;
|
||||||
|
AudioPlayerService.OnVolumeChangeRequested -= OnServiceVolumeChange;
|
||||||
|
AudioPlayerService.OnStateChanged -= OnServiceStateChanged;
|
||||||
|
|
||||||
if (_audioElement != null)
|
if (_audioElement != null)
|
||||||
await _audioElement.DisposeAsync();
|
await _audioElement.DisposeAsync();
|
||||||
if (_audioModule != null)
|
if (_audioModule != null)
|
||||||
@@ -298,4 +307,9 @@
|
|||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
DisposeAsync().AsTask().Wait();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -5,11 +5,33 @@ public static class LongExtensions
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Преобразует миллисекунды в формат Минуты:Секунды
|
/// Преобразует миллисекунды в формат Минуты:Секунды
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string FormatDuration(this long ms)
|
public static string FormatDuration(this long ms, FormatDurationType format = FormatDurationType.mmss)
|
||||||
{
|
{
|
||||||
var seconds = ms / 1000;
|
var seconds = ms / 1000;
|
||||||
var mins = seconds / 60;
|
|
||||||
var secs = seconds % 60;
|
var mm = seconds / 60;
|
||||||
return $"{mins}:{secs:D2}";
|
var ss = seconds % 60;
|
||||||
|
|
||||||
|
if (format == FormatDurationType.mmss || mm < 60)
|
||||||
|
{
|
||||||
|
return $"{mm}:{ss:D2}";
|
||||||
|
}
|
||||||
|
else if (format == FormatDurationType.hhmmss)
|
||||||
|
{
|
||||||
|
var hh = mm / 60;
|
||||||
|
mm = mm / 60;
|
||||||
|
|
||||||
|
return $"{hh}:{mm:D2}:{ss:D2}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return $"{mm}:{ss:D2}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum FormatDurationType
|
||||||
|
{
|
||||||
|
mmss,
|
||||||
|
hhmmss,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
public static class CustomIcons
|
public static class CustomIcons
|
||||||
{
|
{
|
||||||
// SVG путь для логотипа Яндекса (буква Я в круге или просто Я)
|
public const string Yandex = @"<path d='M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm.72 15.79h-2.14v-1.58c-.37.49-.87.89-1.48 1.18-.61.29-1.29.44-2.03.44-1.2 0-2.13-.34-2.8-.1-1.02-.66-1.52-1.61-1.52-2.84 0-1.25.43-2.22 1.28-2.91.85-.69 2.05-1.04 3.59-1.04h1.1v-.84c0-.62-.15-1.07-.46-1.34-.31-.27-.79-.41-1.44-.41-.53 0-1.02.08-1.48.24-.46.16-.9.41-1.32.74v-1.8c.48-.25 1.01-.45 1.58-.59.57-.14 1.15-.21 1.74-.21 1.45 0 2.53.33 3.23 1 .7.67 1.05 1.66 1.05 2.97v6.29zm-2.14-5.18h-.9c-.8 0-1.4.15-1.8.44-.4.29-.6.74-.6 1.34 0 .55.16.96.48 1.23.32.27.76.41 1.32.41.51 0 .97-.13 1.37-.39.4-.26.6-.64.6-1.14v-1.89z'/>";
|
||||||
public const string Yandex = "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm.72 15.79h-2.14v-1.58c-.37.49-.87.89-1.48 1.18-.61.29-1.29.44-2.03.44-1.2 0-2.13-.34-2.8-.1-1.02-.66-1.52-1.61-1.52-2.84 0-1.25.43-2.22 1.28-2.91.85-.69 2.05-1.04 3.59-1.04h1.1v-.84c0-.62-.15-1.07-.46-1.34-.31-.27-.79-.41-1.44-.41-.53 0-1.02.08-1.48.24-.46.16-.9.41-1.32.74v-1.8c.48-.25 1.01-.45 1.58-.59.57-.14 1.15-.21 1.74-.21 1.45 0 2.53.33 3.23 1 .7.67 1.05 1.66 1.05 2.97v6.29zm-2.14-5.18h-.9c-.8 0-1.4.15-1.8.44-.4.29-.6.74-.6 1.34 0 .55.16.96.48 1.23.32.27.76.41 1.32.41.51 0 .97-.13 1.37-.39.4-.26.6-.64.6-1.14v-1.89z";
|
public const string YandexMusic = "<path d='M23.8 9.4l-.1-.5-3.9-.9 2-3-.2-.3-3.1 1.5.3-4.2-.3-.2-2 3.4L14.3 0h-.4l.6 4.9-5.7-4.5-.5.1 4.4 5.5-8.7-2.9-.4.4 7.8 4.4-10.7.9-.1.7 11.2 1.2-9.3 7.6.4.6 11.1-6.1-2.2 10.6h.7l4.3-10 2.6 7.8.4-.3-.9-7.8 3.9 4.5.2-.4-2.9-5.5 4.2 1.5.1-.5-3.5-2.8 3.3-.7z'/>";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<MudCard>
|
<MudCard>
|
||||||
<MudCardContent Class="text-center">
|
<MudCardContent Class="text-center">
|
||||||
<MudText Typo="Typo.h5" Class="mb-4">Вход в PlaylistShared</MudText>
|
<MudText Typo="Typo.h5" Class="mb-4">Вход в PlaylistShared</MudText>
|
||||||
|
@*
|
||||||
<MudText Typo="Typo.body2" Class="mb-6">
|
<MudText Typo="Typo.body2" Class="mb-6">
|
||||||
Войдите через учётную запись Keycloak или используйте локальный аккаунт.
|
Войдите через учётную запись Keycloak или используйте локальный аккаунт.
|
||||||
</MudText>
|
</MudText>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</MudButton>
|
</MudButton>
|
||||||
|
|
||||||
<MudDivider Class="my-4">или</MudDivider>
|
<MudDivider Class="my-4">или</MudDivider>
|
||||||
|
*@
|
||||||
<!-- Локальная форма входа -->
|
<!-- Локальная форма входа -->
|
||||||
<MudTextField @bind-Value="_loginModel.Username" Label="Имя пользователя" Variant="Variant.Outlined" FullWidth="true" Class="mb-3" />
|
<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" />
|
<MudTextField @bind-Value="_loginModel.Password" Label="Пароль" Variant="Variant.Outlined" FullWidth="true" InputType="InputType.Password" @bind-Value:after="LocalLogin" />
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
@using PlaylistShared.Shared.DTO
|
@using PlaylistShared.Shared.DTO
|
||||||
@using PlaylistShared.Shared.Enums
|
@using PlaylistShared.Shared.Enums
|
||||||
@using PlaylistShared.Pwa.Services
|
@using PlaylistShared.Pwa.Services
|
||||||
|
@using PlaylistShared.Shared.Profile
|
||||||
@using PlaylistShared.Shared.SharedPlaylist
|
@using PlaylistShared.Shared.SharedPlaylist
|
||||||
@using PlaylistShared.Shared.Yandex
|
@using PlaylistShared.Shared.Yandex
|
||||||
@inject HttpClient Http
|
@inject HttpClient Http
|
||||||
@@ -17,7 +18,6 @@
|
|||||||
@inject IDialogService DialogService
|
@inject IDialogService DialogService
|
||||||
@inject IAudioPlayerService AudioPlayerService
|
@inject IAudioPlayerService AudioPlayerService
|
||||||
@inject IJSRuntime JS
|
@inject IJSRuntime JS
|
||||||
@inject IDialogService DialogService
|
|
||||||
@implements IDisposable
|
@implements IDisposable
|
||||||
|
|
||||||
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1 px-1" Style="height: 100%;">
|
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="py-1 px-1" Style="height: 100%;">
|
||||||
@@ -45,6 +45,11 @@
|
|||||||
<MudIconButton Icon="@Icons.Material.Filled.Share"
|
<MudIconButton Icon="@Icons.Material.Filled.Share"
|
||||||
OnClick="SharePlaylist"
|
OnClick="SharePlaylist"
|
||||||
Size="Size.Medium" />
|
Size="Size.Medium" />
|
||||||
|
|
||||||
|
<MudIconButton Icon="@CustomIcons.YandexMusic"
|
||||||
|
Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
|
||||||
|
Target="_blank"
|
||||||
|
Size="Size.Medium" />
|
||||||
|
|
||||||
@if (_isCreator && _isAuthenticated)
|
@if (_isCreator && _isAuthenticated)
|
||||||
{
|
{
|
||||||
@@ -127,6 +132,12 @@
|
|||||||
<MudMenuItem Icon="@Icons.Material.Filled.Share"
|
<MudMenuItem Icon="@Icons.Material.Filled.Share"
|
||||||
OnClick="SharePlaylist"
|
OnClick="SharePlaylist"
|
||||||
Label="Поделиться" />
|
Label="Поделиться" />
|
||||||
|
|
||||||
|
<MudMenuItem Icon="@CustomIcons.YandexMusic"
|
||||||
|
Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
|
||||||
|
Label="Открыть в ЯМ"
|
||||||
|
Target="_blank" />
|
||||||
|
|
||||||
@if (_isCreator && _isAuthenticated)
|
@if (_isCreator && _isAuthenticated)
|
||||||
{
|
{
|
||||||
<MudMenuItem Icon="@Icons.Material.Filled.Settings"
|
<MudMenuItem Icon="@Icons.Material.Filled.Settings"
|
||||||
@@ -186,10 +197,30 @@
|
|||||||
<MudImage Src="@_playlist.CoverUrl.FormatCoverUrl(60, 60)" Height="60" Width="60" Class="rounded shadow-sm" />
|
<MudImage Src="@_playlist.CoverUrl.FormatCoverUrl(60, 60)" Height="60" Width="60" Class="rounded shadow-sm" />
|
||||||
}
|
}
|
||||||
|
|
||||||
<MudText Typo="Typo.h6" Color="Color.Primary">
|
<MudStack Spacing="0" Class="pb-1">
|
||||||
@_playlist?.Title
|
<MudText Typo="Typo.h6" Color="Color.Primary">
|
||||||
</MudText>
|
@_playlist?.Title
|
||||||
|
</MudText>
|
||||||
|
|
||||||
|
@if (_tracksLoading)
|
||||||
|
{
|
||||||
|
<MudSkeleton Width="200px" Height="20px" SkeletonType="SkeletonType.Text" />
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">
|
||||||
|
@($"Треков: {_playlistTrackCount} • Продолжительность: {_playlistDurationMs.FormatDuration(LongExtensions.FormatDurationType.hhmmss)}")
|
||||||
|
</MudText>
|
||||||
|
}
|
||||||
|
</MudStack>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
<MudTextField @bind-Value="_playlistFilterText"
|
||||||
|
Placeholder="Фильтр треков..."
|
||||||
|
Adornment="Adornment.Start"
|
||||||
|
AdornmentIcon="@Icons.Material.Filled.Search"
|
||||||
|
Variant="Variant.Text"
|
||||||
|
FullWidth
|
||||||
|
Class="mb-2" />
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -207,7 +238,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
<MudTable Items="@_tracks"
|
<MudTable Items="@FilteredPlaylistTracks"
|
||||||
Hover
|
Hover
|
||||||
Elevation="0"
|
Elevation="0"
|
||||||
Breakpoint="Breakpoint.None"
|
Breakpoint="Breakpoint.None"
|
||||||
@@ -232,7 +263,7 @@
|
|||||||
{
|
{
|
||||||
<MudCard Class="d-flex flex-column" Elevation="0" Style="height: 100%;">
|
<MudCard Class="d-flex flex-column" Elevation="0" Style="height: 100%;">
|
||||||
<MudCardHeader Class="pb-0">
|
<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>
|
<MudText Typo="Typo.h6" Color="Color.Primary" Class="mb-4">Добавление треков</MudText>
|
||||||
<MudTextField @bind-Value="_searchQuery"
|
<MudTextField @bind-Value="_searchQuery"
|
||||||
@bind-Value:after="OnSearchQueryChanged"
|
@bind-Value:after="OnSearchQueryChanged"
|
||||||
@@ -242,19 +273,23 @@
|
|||||||
Label="Название или ссылка на трек"
|
Label="Название или ссылка на трек"
|
||||||
Disabled="@_isSearching"
|
Disabled="@_isSearching"
|
||||||
Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
|
Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search" AdornmentColor="Color.Secondary" />
|
||||||
|
<div class="horizontal-scroll-container">
|
||||||
<MudToggleGroup T="TrackSearchType"
|
<MudToggleGroup T="TrackSearchType"
|
||||||
@bind-Value="_searchType"
|
@bind-Value="_searchType"
|
||||||
@bind-Value:after="OnSearchTypeChanged"
|
@bind-Value:after="OnSearchTypeChanged"
|
||||||
Size="Size.Small"
|
Size="Size.Small"
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
Disabled="@(_isSearching)">
|
Disabled="@(_isSearching)"
|
||||||
<MudToggleItem Value="TrackSearchType.All" Text="Все" />
|
Class="mt-2"
|
||||||
<MudToggleItem Value="TrackSearchType.Track" Text="Треки" />
|
Style="display: inline-flex; flex-wrap: nowrap;">
|
||||||
<MudToggleItem Value="TrackSearchType.Album" Text="Альбомы" />
|
<MudToggleItem Value="TrackSearchType.All" Class="px-2" Text="Все" />
|
||||||
<MudToggleItem Value="TrackSearchType.Playlist" Text="Плейлисты" />
|
<MudToggleItem Value="TrackSearchType.Track" Class="px-2" Text="Треки" />
|
||||||
<MudToggleItem Value="TrackSearchType.Artist" Text="Исполнители" />
|
<MudToggleItem Value="TrackSearchType.Album" Class="px-2" Text="Альбомы" />
|
||||||
</MudToggleGroup>
|
<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>
|
</MudStack>
|
||||||
</MudCardHeader>
|
</MudCardHeader>
|
||||||
|
|
||||||
@@ -328,11 +363,46 @@
|
|||||||
</div>
|
</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)
|
@if (_searchResult?.Tracks != null)
|
||||||
{
|
{
|
||||||
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Треки</MudText>
|
<MudText Typo="Typo.h6" Class="mt-4 mb-2 ml-2">Треки</MudText>
|
||||||
<MudTable Items="@_searchResult.Tracks"
|
<MudTextField @bind-Value="_searchFilterText"
|
||||||
|
Placeholder="Фильтр треков..."
|
||||||
|
Adornment="Adornment.Start"
|
||||||
|
AdornmentIcon="@Icons.Material.Filled.Search"
|
||||||
|
Variant="Variant.Text"
|
||||||
|
FullWidth
|
||||||
|
Class="mb-2" />
|
||||||
|
<MudTable Items="@FilteredSearchTracks"
|
||||||
Hover
|
Hover
|
||||||
Elevation="0"
|
Elevation="0"
|
||||||
Style="min-height: 0;"
|
Style="min-height: 0;"
|
||||||
@@ -373,6 +443,14 @@
|
|||||||
/// Список добавленных в плейлист треков.
|
/// Список добавленных в плейлист треков.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private List<YandexTrack> _tracks = new();
|
private List<YandexTrack> _tracks = new();
|
||||||
|
/// <summary>
|
||||||
|
/// Продолжительность плейлиста.
|
||||||
|
/// </summary>
|
||||||
|
long _playlistDurationMs;
|
||||||
|
/// <summary>
|
||||||
|
/// Кол-во треков в ПЛ.
|
||||||
|
/// </summary>
|
||||||
|
int _playlistTrackCount;
|
||||||
|
|
||||||
/// <summary>Свойства плейлиста.</summary>
|
/// <summary>Свойства плейлиста.</summary>
|
||||||
private SharedPlaylistDto? _playlist;
|
private SharedPlaylistDto? _playlist;
|
||||||
@@ -393,6 +471,16 @@
|
|||||||
private bool _loading = true;
|
private bool _loading = true;
|
||||||
/// <summary>Состояние: Происходит загрузка треков плейлиста.</summary>
|
/// <summary>Состояние: Происходит загрузка треков плейлиста.</summary>
|
||||||
private bool _tracksLoading = true;
|
private bool _tracksLoading = true;
|
||||||
|
|
||||||
|
/// <summary>Текст фильтра для треков плейлиста</summary>
|
||||||
|
private string _playlistFilterText = "";
|
||||||
|
private List<YandexTrack> FilteredPlaylistTracks =>
|
||||||
|
string.IsNullOrWhiteSpace(_playlistFilterText)
|
||||||
|
? _tracks
|
||||||
|
: _tracks.Where(t => t.Title.Contains(_playlistFilterText, StringComparison.InvariantCultureIgnoreCase) ||
|
||||||
|
t.Artists.Any(a => a.Name.Contains(_playlistFilterText, StringComparison.InvariantCultureIgnoreCase)))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
|
||||||
/********************************
|
/********************************
|
||||||
* Вкладка добавления треков
|
* Вкладка добавления треков
|
||||||
@@ -407,9 +495,17 @@
|
|||||||
private MudTextField<string> _searchField;
|
private MudTextField<string> _searchField;
|
||||||
/// <summary>Результат поиска.</summary>
|
/// <summary>Результат поиска.</summary>
|
||||||
private YandexSearchResult? _searchResult = null;
|
private YandexSearchResult? _searchResult = null;
|
||||||
|
/// <summary>Текст фильтра для результатов поиска</summary>
|
||||||
|
private string _searchFilterText = "";
|
||||||
|
private List<YandexTrack> FilteredSearchTracks =>
|
||||||
|
string.IsNullOrWhiteSpace(_searchFilterText) || _searchResult?.Tracks == null
|
||||||
|
? _searchResult?.Tracks ?? new List<YandexTrack>()
|
||||||
|
: _searchResult.Tracks.Where(t => t.Title.Contains(_searchFilterText, StringComparison.InvariantCultureIgnoreCase) ||
|
||||||
|
t.Artists.Any(a => a.Name.Contains(_searchFilterText, StringComparison.InvariantCultureIgnoreCase)))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
/********************************
|
/********************************
|
||||||
* Вкладка добавления треков
|
* Контекстные кнопки
|
||||||
*********************************/
|
*********************************/
|
||||||
/// <summary>Признак, что альбом в фаворитах.</summary>
|
/// <summary>Признак, что альбом в фаворитах.</summary>
|
||||||
private bool _isFavorite;
|
private bool _isFavorite;
|
||||||
@@ -522,7 +618,9 @@
|
|||||||
if (response?.Success == true && response.Data != null)
|
if (response?.Success == true && response.Data != null)
|
||||||
{
|
{
|
||||||
_tracks = response.Data.Tracks;
|
_tracks = response.Data.Tracks;
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
|
||||||
|
_playlistDurationMs = _tracks.Sum(t => t.DurationMs);
|
||||||
|
_playlistTrackCount = _tracks.Count();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -541,11 +639,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task GenerateUniqTrackIds()
|
|
||||||
{
|
|
||||||
_existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>Удаление трека из списка плейлиста</summary>
|
/// <summary>Удаление трека из списка плейлиста</summary>
|
||||||
private async Task OnRemoveTrack(YandexTrack track)
|
private async Task OnRemoveTrack(YandexTrack track)
|
||||||
{
|
{
|
||||||
@@ -559,7 +652,6 @@
|
|||||||
await RemoveTrack(track);
|
await RemoveTrack(track);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region Добавление/удаление трека
|
#region Добавление/удаление трека
|
||||||
/// <summary>Добавление трека.</summary>
|
/// <summary>Добавление трека.</summary>
|
||||||
@@ -574,8 +666,10 @@
|
|||||||
if (response.IsSuccessStatusCode)
|
if (response.IsSuccessStatusCode)
|
||||||
{
|
{
|
||||||
Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
|
Snackbar.Add($"Трек \"{track.Title}\" добавлен", Severity.Success, c => c.SnackbarVariant = Variant.Outlined);
|
||||||
_tracks.Add(track);
|
_tracks.Insert(0, track);
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds.Add(track.TrackId);
|
||||||
|
_playlistDurationMs += track.DurationMs;
|
||||||
|
_playlistTrackCount += 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -604,7 +698,9 @@
|
|||||||
{
|
{
|
||||||
Snackbar.Add("Трек удалён", Severity.Success);
|
Snackbar.Add("Трек удалён", Severity.Success);
|
||||||
_tracks.Remove(track);
|
_tracks.Remove(track);
|
||||||
await GenerateUniqTrackIds();
|
_existingTrackIds.Remove(track.TrackId);
|
||||||
|
_playlistDurationMs -= track.DurationMs;
|
||||||
|
_playlistTrackCount -= 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -640,13 +736,50 @@
|
|||||||
private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
|
private async Task SearchTracks(bool byId = false, string? forcedQuery = null)
|
||||||
{
|
{
|
||||||
var query = forcedQuery ?? _searchQuery;
|
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;
|
_searchResult = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var type = _searchType;
|
|
||||||
|
|
||||||
// Распознавание ссылки Яндекс.Музыки
|
// Распознавание ссылки Яндекс.Музыки
|
||||||
if (!byId && Uri.TryCreate(query, 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")
|
||||||
@@ -671,7 +804,7 @@
|
|||||||
|
|
||||||
try
|
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)
|
if (byId)
|
||||||
url += "&byId=true";
|
url += "&byId=true";
|
||||||
if (!string.IsNullOrEmpty(Token))
|
if (!string.IsNullOrEmpty(Token))
|
||||||
@@ -831,7 +964,7 @@
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Поделитьсы ссылкой
|
#region Поделиться ссылкой
|
||||||
/// <summary> Поделиться ссылкой </summary>
|
/// <summary> Поделиться ссылкой </summary>
|
||||||
private async Task SharePlaylist()
|
private async Task SharePlaylist()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,4 +13,5 @@ public enum TrackSearchType
|
|||||||
Album,
|
Album,
|
||||||
Playlist,
|
Playlist,
|
||||||
Track,
|
Track,
|
||||||
|
MyPlaylists,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,18 @@ public class YandexSearchResult
|
|||||||
[JsonPropertyName("playlists")]
|
[JsonPropertyName("playlists")]
|
||||||
public List<YandexPlaylist>? Playlists { get; set; } = null;
|
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>
|
||||||
/// Найденные исполнители.
|
/// Найденные исполнители.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user