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-15 16:57:11 +03:00
parent 76c9b11a68
commit 629f14cbb9
6 changed files with 90 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PlaylistShared.Pwa/Components/Common/TrackCoverWithPlay.razor
View File

@@ -7,7 +7,7 @@
<MudImage Src="@CoverUrl.FormatCoverUrl(Width, Height)" Height="@Height" Width="@Width" Class="rounded" Style="display: block;" />
@if (_isHovered || IsCurrentTrackPlaying)
@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;">
@@ -26,6 +26,7 @@
[Parameter] public int Height { get; set; } = 50;
[Parameter] public int Width { get; set; } = 50;
[Parameter] public string PlaylistShareToken { get; set; } = string.Empty;
[Parameter] public bool CanPlay { get; set; } = false;
private bool IsCurrentTrackPlaying => AudioPlayerService.IsPlaying && AudioPlayerService.CurrentTrackId == TrackId;

2
PlaylistShared.Pwa/Components/Common/TrackItem.razor
View File

@@ -9,6 +9,7 @@
TrackId="@Track.TrackId"
TrackTitle="@Track.Title"
PlaylistShareToken="@PlaylistShareToken"
CanPlay="@CanPlay"
Width="40" Height="40" />
</MudItem>
@@ -31,4 +32,5 @@
@code {
[Parameter] public YandexTrack Track { get; set; } = null!;
[Parameter] public string PlaylistShareToken { get; set; } = string.Empty;
[Parameter] public bool CanPlay { get; set; } = true;
}

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

@@ -29,7 +29,7 @@
</MudToggleGroup>
<MudTable Items="@_searchResults"
Virtualize="@true"
Virtualize="true"
Height="400px"
Hover="true"
Breakpoint="Breakpoint.Sm"
@@ -39,7 +39,7 @@
<TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
</MudTd>
<MudTd>
<MudToggleIconButton Toggled="_addingTrackIds.Contains(context.TrackId)"
<MudToggleIconButton Toggled="@ExistingTrackIds.Contains(context.TrackId)"
Icon="@Icons.Material.Filled.AddCircle"
Color="@Color.Primary"
ToggledIcon="@Icons.Material.Filled.RemoveCircle"
@@ -54,13 +54,13 @@
[Parameter] public string ShareToken { get; set; } = string.Empty;
[Parameter] public EventCallback OnTrackAdded { get; set; }
[Parameter] public EventCallback OnTrackRemoved { get; set; }
[Parameter] public HashSet<string> ExistingTrackIds { get; set; } = new();
private string _searchQuery = "";
private bool _isSearching = false;
private bool _isFirstSearch = true;
private TrackSearchType _searchType = TrackSearchType.All;
private List<YandexTrack> _searchResults = new();
private HashSet<string> _addingTrackIds = new();
private async Task SearchTracks()
{
@@ -124,7 +124,7 @@
private async Task ToggleTrack(YandexTrack track)
{
if (_addingTrackIds.Contains(track.TrackId))
if (ExistingTrackIds.Contains(track.TrackId))
{
await RemoveTrack(track);
}
@@ -136,7 +136,7 @@
private async Task RemoveTrack(YandexTrack track)
{
if (!_addingTrackIds.Remove(track.TrackId)) return;
if (!ExistingTrackIds.Remove(track.TrackId)) return;
try
@@ -148,7 +148,7 @@
catch (Exception ex)
{
Snackbar.Add($"Ошибка добавления: {ex.Message}", Severity.Error);
_addingTrackIds.Add(track.TrackId);
ExistingTrackIds.Add(track.TrackId);
}
finally
{
@@ -158,8 +158,8 @@
private async Task AddTrack(YandexTrack track)
{
if (_addingTrackIds.Contains(track.TrackId)) return;
_addingTrackIds.Add(track.TrackId);
if (ExistingTrackIds.Contains(track.TrackId)) return;
ExistingTrackIds.Add(track.TrackId);
try
{
@@ -170,7 +170,7 @@
catch (Exception ex)
{
Snackbar.Add($"Ошибка добавления: {ex.Message}", Severity.Error);
_addingTrackIds.Remove(track.TrackId);
ExistingTrackIds.Remove(track.TrackId);
}
finally
{

1
PlaylistShared.Pwa/Components/SharedPlaylist/PlaylistHeader.razor
View File

@@ -40,7 +40,6 @@
Size="Size.Medium" />
}
</MudStack>
<MudText Typo="Typo.body2" Color="Color.Secondary">Владелец: @Playlist?.Creator?.UserName</MudText>
</MudStack>
</MudStack>

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

@@ -1,115 +0,0 @@
@using PlaylistShared.Pwa.Components.Common
@using PlaylistShared.Shared.DTO
@using PlaylistShared.Shared.SharedPlaylist
@inject HttpClient Http
@inject ISnackbar Snackbar
@inject IDialogService DialogService
<MudTable Items="@_tracks" Hover="true" Breakpoint="Breakpoint.Sm" Loading="@_loading">
<RowTemplate>
<MudTd Style="width: 100%;">
<TrackItem Track="@context" PlaylistShareToken="@ShareToken" />
</MudTd>
@if (CanRemove)
{
<MudTd>
<MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="() => RemoveTrack(context)" />
</MudTd>
}
</RowTemplate>
</MudTable>
@code {
[Parameter] public string ShareToken { get; set; } = string.Empty;
[Parameter] public bool CanPlay { get; set; }
[Parameter] public bool CanRemove { get; set; }
[Parameter] public bool IsPlaying { get; set; }
[Parameter] public EventCallback<string> OnPlayTrack { get; set; }
public async Task Reload()
{
await LoadTracks();
}
private List<TrackDisplay> _tracks = new();
private bool _loading = true;
protected override async Task OnInitializedAsync()
{
await LoadTracks();
}
private async Task LoadTracks()
{
_loading = true;
try
{
var response = await Http.GetFromJsonAsync<ApiResponse<YandexPlaylistData>>($"/api/sharedplaylist/{ShareToken}/tracks");
if (response?.Success == true && response.Data != null)
{
_tracks = response.Data.Tracks.Select((t, idx) => new TrackDisplay
{
TrackId = t.TrackId,
Title = t.Title,
Artists = t.Artists,
DurationMs = t.DurationMs,
CoverUri = t.CoverUri,
Index = idx + 1
}).ToList();
}
else
{
Snackbar.Add(response?.Error?.Message ?? "Не удалось загрузить треки", Severity.Error);
}
}
catch (Exception ex)
{
Snackbar.Add($"Ошибка загрузки треков: {ex.Message}", Severity.Error);
}
finally
{
_loading = false;
StateHasChanged();
}
}
private async Task RemoveTrack(TrackDisplay track)
{
var confirmed = await DialogService.ShowMessageBoxAsync(
"Подтверждение удаления",
$"Вы уверены, что хотите удалить трек \"{track.Title}\"?",
yesText: "Удалить", cancelText: "Отмена");
if (confirmed != true) return;
try
{
var request = new UpdateTrackListRequest { TrackIds = new List<string> { track.TrackId } };
var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{ShareToken}/remove-tracks", request);
if (response.IsSuccessStatusCode)
{
Snackbar.Add("Трек удалён", Severity.Success);
await LoadTracks();
}
else
{
var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
Snackbar.Add(error?.Error?.Message ?? "Ошибка удаления", Severity.Error);
}
}
catch (Exception ex)
{
Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
}
}
private async Task PlayTrack(string trackId)
{
await OnPlayTrack.InvokeAsync(trackId);
}
private class TrackDisplay : YandexTrack
{
public int Index { get; set; }
}
}

92
PlaylistShared.Pwa/Pages/SharedPlaylistView.razor
View File

@@ -1,4 +1,5 @@
@page "/shared/{token}"
@using PlaylistShared.Pwa.Components.Common
@using PlaylistShared.Pwa.Components.SharedPlaylist
@using PlaylistShared.Shared.DTO
@using PlaylistShared.Shared.Enums
@@ -24,7 +25,6 @@
<MudSplitPanel>
<FirstPanel>
<MudCard>
<!-- Заголовок с обложкой -->
<MudCardHeader>
<CardHeaderContent>
<PlaylistHeader Playlist="@_playlist" />
@@ -32,12 +32,25 @@
</MudCardHeader>
<MudCardContent>
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="_tracksLoading" Size="Size.Medium" />
<TracksTable @ref="_tracksTableRef"
ShareToken="@Token"
CanPlay="@_canPlay"
CanRemove="@_canRemove"
/>
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="LoadTracks" Disabled="@_tracksLoading" Size="Size.Medium" />
<MudTable Items="@_tracks"
Virtualize="true"
Height="400px"
Hover="true"
Breakpoint="Breakpoint.Sm"
Loading="@_tracksLoading">
<RowTemplate>
<MudTd Style="width: 100%;">
<TrackItem Track="@context" PlaylistShareToken="Token" CanPlay="@_canPlay" />
</MudTd>
@if (_canRemove)
{
<MudTd>
<MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error" OnClick="() => RemoveTrack(context)" />
</MudTd>
}
</RowTemplate>
</MudTable>
</MudCardContent>
</MudCard>
</FirstPanel>
@@ -51,7 +64,7 @@
</CardHeaderContent>
</MudCardHeader>
<MudCardContent>
<AddTrackSection ShareToken="@Token" OnTrackAdded="LoadTracks" OnTrackRemoved="LoadTracks" />
<AddTrackSection ShareToken="Token" OnTrackAdded="LoadTracks" OnTrackRemoved="LoadTracks" ExistingTrackIds="_existingTrackIds" />
</MudCardContent>
</MudCard>
}
@@ -64,7 +77,9 @@
@code {
[Parameter] public string Token { get; set; }
private TracksTable? _tracksTableRef;
private HashSet<string> _existingTrackIds = new();
private bool _firstLoadExistingTrackIds;
private List<YandexTrack> _tracks = new();
private SharedPlaylistDto? _playlist;
private bool _loading = true;
@@ -90,6 +105,7 @@
_isAuthenticated = authState.User.Identity?.IsAuthenticated == true;
_currentUserId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
await LoadPlaylist();
await LoadTracks();
}
private async Task ConfigurePermissions()
@@ -141,7 +157,6 @@
_playlist = response.Data;
await ConfigurePermissions();
//await LoadTracks();
}
else
{
@@ -162,14 +177,61 @@
private async Task LoadTracks()
{
if (_playlist == null) return;
if (_tracksTableRef == null) return;
_tracksLoading = true;
StateHasChanged();
await _tracksTableRef.Reload();
try
{
var response = await Http.GetFromJsonAsync<ApiResponse<YandexPlaylistData>>($"/api/sharedplaylist/{Token}/tracks");
if (response?.Success == true && response.Data != null)
{
_tracks = response.Data.Tracks;
_existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
}
else
{
Snackbar.Add(response?.Error?.Message ?? "Не удалось загрузить треки", Severity.Error);
}
_tracksLoading = false;
StateHasChanged();
}
catch (Exception ex)
{
Snackbar.Add($"Ошибка загрузки треков: {ex.Message}", Severity.Error);
}
finally
{
_tracksLoading = false;
StateHasChanged();
}
}
private async Task RemoveTrack(YandexTrack track)
{
var confirmed = await DialogService.ShowMessageBoxAsync(
"Подтверждение удаления",
$"Вы уверены, что хотите удалить трек \"{track.Title}\"?",
yesText: "Удалить", cancelText: "Отмена");
if (confirmed != true) return;
try
{
var request = new UpdateTrackListRequest { TrackIds = new List<string> { track.TrackId } };
var response = await Http.PostAsJsonAsync($"/api/sharedplaylist/{Token}/remove-tracks", request);
if (response.IsSuccessStatusCode)
{
Snackbar.Add("Трек удалён", Severity.Success);
await LoadTracks();
}
else
{
var error = await response.Content.ReadFromJsonAsync<ApiResponse<object>>();
Snackbar.Add(error?.Error?.Message ?? "Ошибка удаления", Severity.Error);
}
}
catch (Exception ex)
{
Snackbar.Add($"Ошибка: {ex.Message}", Severity.Error);
}
}
}