Updated packages.

Harmonia.Core/Caching/Cache.cs

@@ -60,7 +60,7 @@ public abstract class Cache<TKey, TValue> : ICache<TKey, TValue> where TKey : no
             if (lockAcquired)
                 lockObject.Release();
 
-            _locks.TryRemove(lockObject, out _);
+            _locks.TryRemove(actualKey, out _);
 
             if (throttlerAcquired)
                 _throttler.Release();

Harmonia.WinUI/App.xaml.cs

@@ -1,5 +1,4 @@
 using Harmonia.Core.Extensions;
-using Harmonia.Core.Playlists;
 using Harmonia.WinUI.Caching;
 using Harmonia.WinUI.Storage;
 using Harmonia.WinUI.ViewModels;

Harmonia.WinUI/Caching/AudioBitmapImageCache.cs

@@ -40,7 +40,9 @@ public class AudioBitmapImageCache(IAudioImageExtractor audioImageExtractor) : M
 
     protected override async ValueTask<BitmapImage?> FetchAsync(Song key, CancellationToken cancellationToken)
     {
-        SongPictureInfo? songPictureInfo = await audioImageExtractor.ExtractImageAsync(key.FileName, cancellationToken);
+        SongPictureInfo? songPictureInfo = await Task.Run(
+            () => audioImageExtractor.ExtractImageAsync(key.FileName, cancellationToken),
+            cancellationToken);
 
         if (songPictureInfo == null)
             return GetDefaultBitmapImage();
@@ -51,8 +53,17 @@ public class AudioBitmapImageCache(IAudioImageExtractor audioImageExtractor) : M
 
         await bitmapImage.SetSourceAsync(stream.AsRandomAccessStream());
 
-        bitmapImage.DecodePixelWidth = GetDecodePixelWidth(bitmapImage);
+        int decodePixelWidth = GetDecodePixelWidth(bitmapImage);
-        bitmapImage.DecodePixelHeight = GetDecodePixelHeight(bitmapImage);
+        int decodePixelHeight = GetDecodePixelHeight(bitmapImage);
+
+        if (decodePixelWidth > 0 || decodePixelHeight > 0)
+        {
+            bitmapImage.DecodePixelWidth = decodePixelWidth;
+            bitmapImage.DecodePixelHeight = decodePixelHeight;
+
+            stream.Seek(0, SeekOrigin.Begin);
+            await bitmapImage.SetSourceAsync(stream.AsRandomAccessStream());
+        }
 
         return bitmapImage;
     }
@@ -62,8 +73,6 @@ public class AudioBitmapImageCache(IAudioImageExtractor audioImageExtractor) : M
         Uri uri = new("ms-appx:///Assets/Default.png", UriKind.Absolute);
 
         BitmapImage bitmapImage = new();
-        bitmapImage.DecodePixelWidth = GetDecodePixelWidth(bitmapImage);
-        bitmapImage.DecodePixelHeight = GetDecodePixelHeight(bitmapImage);
         bitmapImage.UriSource = uri;
 
         return bitmapImage;
@@ -99,7 +108,10 @@ public class AudioBitmapImageCache(IAudioImageExtractor audioImageExtractor) : M
 
     protected override long GetEntrySize(BitmapImage entry)
     {
-        return entry.DecodePixelWidth * entry.DecodePixelHeight;
+        int width = entry.DecodePixelWidth > 0 ? entry.DecodePixelWidth : entry.PixelWidth;
+        int height = entry.DecodePixelHeight > 0 ? entry.DecodePixelHeight : entry.PixelHeight;
+
+        return (long)width * height * 4;
     }
 }
 

Harmonia.WinUI/Harmonia.WinUI.csproj

@@ -44,7 +44,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.2270" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.2526" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.3.1" />
 	</ItemGroup>
 	<ItemGroup>

Harmonia.WinUI/ViewModels/PlaylistViewModel.cs

@@ -20,11 +20,10 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using System.Windows.Input;
 using Windows.ApplicationModel.DataTransfer;
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
-using Timer = System.Timers.Timer;
+using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 
 namespace Harmonia.WinUI.ViewModels;
 
@@ -40,7 +39,7 @@ public partial class PlaylistViewModel : ViewModelBase
     private readonly DispatcherQueue _dispatcherQueue;
     private readonly ConcurrentDictionary<int, CancellationTokenSource> _imageCancellationTokens = [];
 
-    private Timer? _filterTimer;
+    private DispatcherQueueTimer? _filterTimer;
 
     public Playlist? Playlist { get; private set; }
 
@@ -300,26 +299,19 @@ public partial class PlaylistViewModel : ViewModelBase
     {
         if (_filterTimer == null)
         {
-            _filterTimer = new Timer(300);
+            _filterTimer = _dispatcherQueue.CreateTimer();
-            _filterTimer.Elapsed += OnFilterTimerElapsed;
+            _filterTimer.Interval = TimeSpan.FromMilliseconds(300);
-            _filterTimer.Start();
+            _filterTimer.IsRepeating = false;
+            _filterTimer.Tick += OnFilterTimerTick;
         }
-        else
-        {
-            _filterTimer.Interval = 300;
-        }
-    }
-
-    private void OnFilterTimerElapsed(object? sender, ElapsedEventArgs e)
-    {
-        if (_filterTimer == null)
-            return;
 
         _filterTimer.Stop();
-        _filterTimer.Dispose();
+        _filterTimer.Start();
-        _filterTimer = null;
+    }
 
-        _dispatcherQueue.TryEnqueue(UpdateFilteredSongs);
+    private void OnFilterTimerTick(DispatcherQueueTimer sender, object args)
+    {
+        UpdateFilteredSongs();
     }
 
     private void UpdateFilteredSongs()
@@ -327,32 +319,31 @@ public partial class PlaylistViewModel : ViewModelBase
         if (Playlist == null)
             return;
 
-        List<PlaylistSong> filteredPlaylistSongs = [.. Playlist.Songs.Where(playlistSong => IsFiltered(playlistSong.Song))];
+        string? filter = Filter;
-        //FilteredPlaylistSongs = [.. filteredPlaylistSongs];
+        HashSet<PlaylistSong> updatedFilterSet = [.. Playlist.Songs.Where(playlistSong => IsFiltered(playlistSong.Song, filter))];
 
         for (int i = FilteredPlaylistSongs.Count - 1; i >= 0; i--)
         {
             PlaylistSong playlistSong = FilteredPlaylistSongs[i];
 
-            bool inPlaylist = Playlist.Songs.Contains(playlistSong);
+            bool inFilterSet = updatedFilterSet.Contains(playlistSong);
-            bool inFilter = filteredPlaylistSongs.Contains(playlistSong);
 
-            if (!inPlaylist || !inFilter)
+            if (!inFilterSet)
-            {
+                FilteredPlaylistSongs.RemoveAt(i);
-                FilteredPlaylistSongs.Remove(playlistSong);
-            }
         }
 
+        HashSet<PlaylistSong> currentSet = [.. FilteredPlaylistSongs];
         int insertionIndex = 0;
 
         foreach (PlaylistSong playlistSong in Playlist.Songs)
         {
-            bool inFilter = filteredPlaylistSongs.Contains(playlistSong);
+            bool inFilterSet = updatedFilterSet.Contains(playlistSong);
-            bool inCurrentFilteredList = FilteredPlaylistSongs.Contains(playlistSong);
+            bool inCurrentSet = currentSet.Contains(playlistSong);
 
-            if (inFilter)
+            if (!inFilterSet)
-            {
+                continue;
-                if (!inCurrentFilteredList)
+
+            if (!inCurrentSet)
             {
                 FilteredPlaylistSongs.Insert(insertionIndex, playlistSong);
             }
@@ -360,28 +351,27 @@ public partial class PlaylistViewModel : ViewModelBase
             insertionIndex++;
         }
     }
-    }
 
-    private bool IsFiltered(Song song)
+    private static bool IsFiltered(Song song, string? filter)
     {
-        if (string.IsNullOrWhiteSpace(Filter))
+        if (string.IsNullOrWhiteSpace(filter))
             return true;
 
         var shortFileName = Path.GetFileName(song.FileName);
 
-        if (shortFileName.Contains(Filter, StringComparison.OrdinalIgnoreCase))
+        if (shortFileName.Contains(filter, StringComparison.OrdinalIgnoreCase))
             return true;
 
-        if (string.IsNullOrWhiteSpace(song.Title) == false && song.Title.Contains(Filter, StringComparison.OrdinalIgnoreCase))
+        if (string.IsNullOrWhiteSpace(song.Title) == false && song.Title.Contains(filter, StringComparison.OrdinalIgnoreCase))
             return true;
 
-        if (string.IsNullOrWhiteSpace(song.Album) == false && song.Album.Contains(Filter, StringComparison.OrdinalIgnoreCase))
+        if (string.IsNullOrWhiteSpace(song.Album) == false && song.Album.Contains(filter, StringComparison.OrdinalIgnoreCase))
             return true;
 
-        if (song.AlbumArtists.Any(x => x.Contains(Filter, StringComparison.OrdinalIgnoreCase)))
+        if (song.AlbumArtists.Any(x => x.Contains(filter, StringComparison.OrdinalIgnoreCase)))
             return true;
 
-        if (song.Artists.Any(x => x.Contains(Filter, StringComparison.OrdinalIgnoreCase)))
+        if (song.Artists.Any(x => x.Contains(filter, StringComparison.OrdinalIgnoreCase)))
             return true;
 
         return false;