FrigaT/PlaylistShared
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Доработан поиск и добавление треков

Browse Source
This commit is contained in:
FrigaT
2026-04-14 22:26:58 +03:00
parent 0381ef74ab
commit 6ae49faf15
16 changed files with 92 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackBySearch.razor
View File

@@ -4,14 +4,12 @@
@inject ISnackbar Snackbar
<MudPaper Class="pa-4" Elevation="0" Style="background-color: rgba(0,0,0,0.05); border-radius: 8px;">
<MudText Typo="Typo.h6" GutterBottom>Поиск трека</MudText>
<div style="display: flex; gap: 8px; margin-bottom: 16px;">
<MudTextField @bind-Value="_searchQuery"
Label="Название трека или исполнитель"
Variant="Variant.Outlined"
FullWidth="true"
OnKeyDown="@(async (e) => { if (e.Key == "Enter") await SearchTracks(); })"
OnKeyUp="@(async (e) => { if (e.Key == "Enter") await SearchTracks(); })"
Placeholder="Например: Bohemian Rhapsody" />
<MudButton Variant="Variant.Filled"
Color="Color.Primary"
@@ -44,7 +42,7 @@
<MudText Typo="Typo.body2" Color="Color.Secondary">@string.Join(", ", track.Artists)</MudText>
</div>
<div style="flex-shrink: 0;">
<MudText Typo="Typo.body2">@FormatDuration(track.DurationMs)</MudText>
<MudText Typo="Typo.body2">@track.DurationMs.FormatDuration()</MudText>
</div>
<div style="flex-shrink: 0;">
<MudIconButton Icon="@Icons.Material.Filled.AddCircle"
@@ -57,25 +55,29 @@
}
</div>
}
else if (!string.IsNullOrEmpty(_searchQuery) && !_isSearching)
else if (!_isFirstSearch)
{
<MudAlert Severity="Severity.Info">Ничего не найдено. Попробуйте изменить запрос.</MudAlert>
}
</MudPaper>
@code {
@code {
[Parameter] public EventCallback<string> OnAddTrack { get; set; }
[Parameter] public string ShareToken { get; set; } = string.Empty;
private string _searchQuery = "";
private List<YandexTrackSearchResult> _searchResults = new();
private List<YandexTrack> _searchResults = new();
private bool _isSearching;
private bool _isFirstSearch = true;
private HashSet<string> _addingTrackIds = new();
private string _searchQuery = string.Empty;
private async Task SearchTracks()
{
if (string.IsNullOrWhiteSpace(_searchQuery)) return;
if (string.IsNullOrWhiteSpace(_searchQuery))
return;
_isFirstSearch = false;
_isSearching = true;
try
{
@@ -83,7 +85,7 @@
if (!string.IsNullOrEmpty(ShareToken))
url += $"&shared_id={Uri.EscapeDataString(ShareToken)}";
var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexTrackSearchResult>>>(url);
var response = await Http.GetFromJsonAsync<ApiResponse<List<YandexTrack>>>(url);
if (response?.Success == true)
_searchResults = response.Data ?? new();
else
@@ -100,7 +102,7 @@
}
}
private async Task AddTrack(YandexTrackSearchResult track)
private async Task AddTrack(YandexTrack track)
{
if (_addingTrackIds.Contains(track.TrackId)) return;
_addingTrackIds.Add(track.TrackId);
@@ -119,12 +121,4 @@
StateHasChanged();
}
}
private string FormatDuration(long ms)
{
var seconds = ms / 1000;
var mins = seconds / 60;
var secs = seconds % 60;
return $"{mins}:{secs:D2}";
}
}

6
PlaylistShared.Pwa/Components/SharedPlaylist/AddTrackSection.razor
View File

@@ -9,7 +9,8 @@
<MudItem xs="12" sm="10">
<MudTextField @bind-Value="_trackLink" Label="Ссылка на трек Яндекс.Музыки"
Variant="Variant.Outlined" FullWidth="true"
Placeholder="https://music.yandex.ru/album/2488464/track/21696942" />
Placeholder="https://music.yandex.ru/album/2488464/track/21696942"
OnKeyUp="@(async (e) => { if (e.Key == "Enter") await AddTrackByLink(); })" />
</MudItem>
<MudItem xs="12" sm="2">
<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="AddTrackByLink"
@@ -25,9 +26,6 @@
</MudButton>
</MudItem>
</MudGrid>
<MudText Typo="Typo.body2" Class="mt-2" Color="Color.Secondary">
Поддерживаются ссылки вида: https://music.yandex.ru/album/12345/track/67890
</MudText>
</MudTabPanel>
<MudTabPanel Text="Поиск" Style="padding: 16px;">
<AddTrackBySearch OnAddTrack="AddTrackById"

18
PlaylistShared.Pwa/Components/SharedPlaylist/TracksTable.razor
View File

@@ -25,7 +25,7 @@
@if (CanPlay)
{
<TrackCoverWithPlay CoverUrl="@context.CoverUri"
TrackId="@context.Id"
TrackId="@context.TrackId"
Width="50" Height="50"/>
}
else
@@ -35,13 +35,13 @@
}
</MudTd>
<MudTd DataLabel="Название">
<MudLink Href="@($"https://music.yandex.ru/track/{context.Id}")" Target="_blank" Underline="Underline.Hover">
<MudLink Href="@($"https://music.yandex.ru/track/{context.TrackId}")" Target="_blank" Underline="Underline.Hover">
@context.Title
<MudIcon Icon="@Icons.Material.Filled.OpenInNew" Size="Size.Small" Class="ml-1" />
</MudLink>
</MudTd>
<MudTd DataLabel="Исполнитель">@string.Join(", ", context.Artists)</MudTd>
<MudTd DataLabel="Длительность">@FormatDuration(context.DurationMs)</MudTd>
<MudTd DataLabel="Длительность">@context.DurationMs.FormatDuration()</MudTd>
@if (CanRemove)
{
<MudTd DataLabel="">
@@ -82,7 +82,7 @@
{
_tracks = response.Data.Tracks.Select((t, idx) => new TrackDisplay
{
Id = t.Id,
TrackId = t.TrackId,
Title = t.Title,
Artists = t.Artists,
DurationMs = t.DurationMs,
@@ -117,7 +117,7 @@
try
{
var request = new RemoveTracksRequest { TrackIds = new List<string> { track.Id } };
var request = new RemoveTracksRequest { TrackIds = new List<string> { track.TrackId } };
var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
if (response.IsSuccessStatusCode)
{
@@ -141,14 +141,6 @@
await OnPlayTrack.InvokeAsync(trackId);
}
private string FormatDuration(long ms)
{
var seconds = ms / 1000;
var mins = seconds / 60;
var secs = seconds % 60;
return $"{mins}:{secs:D2}";
}
private class TrackDisplay : YandexTrack
{
public int Index { get; set; }