Добавлена очистка событий

PlaylistShared.Pwa/Components/Global/AudioPlayer.razor

@@ -6,6 +6,8 @@
 @inject AuthenticationStateProvider AuthProvider
 @inject ISnackbar Snackbar
 @inject HttpClient Http
+@implements IDisposable
+@implements IAsyncDisposable
 
     <MudStack Spacing="1" Row AlignItems="AlignItems.Center" Wrap="Wrap.NoWrap">
         <!-- Кнопки управления -->
@@ -291,6 +293,13 @@
     {
         try
         {
+            AudioPlayerService.OnLoadAndPlayRequested -= OnServiceLoadAndPlay;
+            AudioPlayerService.OnPlayRequested -= OnServicePlay;
+            AudioPlayerService.OnPauseRequested -= OnServicePause;
+            AudioPlayerService.OnSeekRequested -= OnServiceSeek;
+            AudioPlayerService.OnVolumeChangeRequested -= OnServiceVolumeChange;
+            AudioPlayerService.OnStateChanged -= OnServiceStateChanged;
+
             if (_audioElement != null)
                 await _audioElement.DisposeAsync();
             if (_audioModule != null)
@@ -298,4 +307,9 @@
         }
         catch { }
     }
+
+    public void Dispose()
+    {
+        DisposeAsync().AsTask().Wait();
+    }
 }

PlaylistShared.Pwa/Extensions/LongExtensions.cs

@@ -5,11 +5,33 @@ public static class LongExtensions
     /// <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 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,
     }
 }

PlaylistShared.Pwa/Icons/CustomIcons.cs

@@ -2,7 +2,6 @@
 
 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'/>";
-}
+}
-

PlaylistShared.Pwa/Pages/SharedPlaylistView.razor

@@ -45,6 +45,11 @@
                                     <MudIconButton Icon="@Icons.Material.Filled.Share"
                                                 OnClick="SharePlaylist" 
                                                 Size="Size.Medium" />
+
+                                    <MudIconButton Icon="@CustomIcons.YandexMusic" 
+                                               Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
+                                               Target="_blank"
+                                               Size="Size.Medium" />
                                     
                                     @if (_isCreator && _isAuthenticated)
                                     {
@@ -127,6 +132,12 @@
                                     <MudMenuItem Icon="@Icons.Material.Filled.Share" 
                                                  OnClick="SharePlaylist" 
                                                  Label="Поделиться" />
+                                                 
+                                    <MudMenuItem Icon="@CustomIcons.YandexMusic" 
+                                                Href="@($"https://music.yandex.ru/playlists/{_playlist?.YandexPlaylistUuid}")"
+                                                 Label="Открыть в ЯМ"
+                                               Target="_blank" />
+
                                     @if (_isCreator && _isAuthenticated)
                                     {
                                     <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" />
                 }
 
-                <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>
+            <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
         {
-            <MudTable Items="@_tracks" 
+            <MudTable Items="@FilteredPlaylistTracks" 
                         Hover 
                         Elevation="0" 
                         Breakpoint="Breakpoint.None" 
@@ -249,7 +280,7 @@
                                         Size="Size.Small"
                                         Color="Color.Primary"
                                         Disabled="@(_isSearching)"
-                                        Class="pt-2"
+                                        Class="mt-2"
                                         Style="display: inline-flex; flex-wrap: nowrap;">
                             <MudToggleItem Value="TrackSearchType.All" Class="px-2" Text="Все" />
                             <MudToggleItem Value="TrackSearchType.Track" Class="px-2" Text="Треки" />
@@ -364,7 +395,14 @@
                     @if (_searchResult?.Tracks != null)
                     {
                         <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
                                     Elevation="0"
                                     Style="min-height: 0;"
@@ -405,6 +443,14 @@
     /// Список добавленных в плейлист треков.
     /// </summary>
     private List<YandexTrack> _tracks = new();
+    /// <summary>
+    /// Продолжительность плейлиста.
+    /// </summary>
+    long _playlistDurationMs;
+    /// <summary>
+    /// Кол-во треков в ПЛ.
+    /// </summary>
+    int _playlistTrackCount;
 
     /// <summary>Свойства плейлиста.</summary>
     private SharedPlaylistDto? _playlist;
@@ -425,6 +471,16 @@
     private bool _loading = true;
     /// <summary>Состояние: Происходит загрузка треков плейлиста.</summary>
     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();
+
 
     /********************************
      * Вкладка добавления треков
@@ -439,9 +495,17 @@
     private MudTextField<string> _searchField;
     /// <summary>Результат поиска.</summary>
     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>
     private bool _isFavorite;
@@ -554,7 +618,9 @@
             if (response?.Success == true && response.Data != null)
             {
                 _tracks = response.Data.Tracks;
-                await GenerateUniqTrackIds();
+                _existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
+                _playlistDurationMs = _tracks.Sum(t => t.DurationMs);
+                _playlistTrackCount = _tracks.Count();
             }
             else
             {
@@ -573,11 +639,6 @@
         }
     }
 
-    private async Task GenerateUniqTrackIds()
-    {
-        _existingTrackIds = _tracks.Select(t => t.TrackId).ToHashSet();
-    }
-
     /// <summary>Удаление трека из списка плейлиста</summary>
     private async Task OnRemoveTrack(YandexTrack track)
     {
@@ -591,7 +652,6 @@
         await RemoveTrack(track);
     }
 
-
     
     #region Добавление/удаление трека
     /// <summary>Добавление трека.</summary>
@@ -606,8 +666,10 @@
             if (response.IsSuccessStatusCode)
             {
                 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
             {
@@ -636,7 +698,9 @@
             {
                 Snackbar.Add("Трек удалён", Severity.Success);
                 _tracks.Remove(track);
-                await GenerateUniqTrackIds();
+                _existingTrackIds.Remove(track.TrackId);
+                _playlistDurationMs -= track.DurationMs;
+                _playlistTrackCount -= 1;
             }
             else
             {
@@ -900,7 +964,7 @@
     }
     #endregion
 
-    #region Поделитьсы ссылкой
+    #region Поделиться ссылкой
     /// <summary> Поделиться ссылкой </summary>
     private async Task SharePlaylist()
     {