Merge branch 'dev' into ui_wpf_modern

Author: Jack251970

Flow.Launcher.Core/ExternalPlugins/CommunityPluginSource.cs

@@ -75,7 +75,7 @@ public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
             }
             catch (OperationCanceledException) when (token.IsCancellationRequested)
             {
-                API.LogInfo(ClassName, $"Fetching from {ManifestFileUrl} was cancelled by caller.");
+                API.LogDebug(ClassName, $"Fetching from {ManifestFileUrl} was cancelled by caller.");
                 return null;
             }
             catch (TaskCanceledException)

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -14,7 +14,7 @@
 
 namespace Flow.Launcher.Core.Resource
 {
-    public class Internationalization
+    public class Internationalization : IDisposable
     {
         private static readonly string ClassName = nameof(Internationalization);
 
@@ -30,6 +30,7 @@ public class Internationalization
         private readonly List<string> _languageDirectories = [];
         private readonly List<ResourceDictionary> _oldResources = [];
         private static string SystemLanguageCode;
+        private readonly SemaphoreSlim _langChangeLock = new(1, 1);
 
         public Internationalization(Settings settings)
         {
@@ -185,20 +186,33 @@ private static Language GetLanguageByLanguageCode(string languageCode)
 
         private async Task ChangeLanguageAsync(Language language, bool updateMetadata = true)
         {
-            // Remove old language files and load language
-            RemoveOldLanguageFiles();
-            if (language != AvailableLanguages.English)
+            await _langChangeLock.WaitAsync();
+
+            try
             {
-                LoadLanguage(language);
-            }
+                // Remove old language files and load language
+                RemoveOldLanguageFiles();
+                if (language != AvailableLanguages.English)
+                {
+                    LoadLanguage(language);
+                }
 
-            // Change culture info
-            ChangeCultureInfo(language.LanguageCode);
+                // Change culture info
+                ChangeCultureInfo(language.LanguageCode);
 
-            if (updateMetadata)
+                if (updateMetadata)
+                {
+                    // Raise event for plugins after culture is set
+                    await Task.Run(UpdatePluginMetadataTranslations);
+                }
+            }
+            catch (Exception e)
             {
-                // Raise event for plugins after culture is set
-                await Task.Run(UpdatePluginMetadataTranslations);
+                API.LogException(ClassName, $"Failed to change language to <{language.LanguageCode}>", e);
+            }
+            finally
+            {
+                _langChangeLock.Release();
             }
         }
 
@@ -257,6 +271,7 @@ private void RemoveOldLanguageFiles()
             {
                 dicts.Remove(r);
             }
+            _oldResources.Clear();
         }
 
         private void LoadLanguage(Language language)
@@ -368,5 +383,15 @@ public static void UpdatePluginMetadataTranslations()
         }
 
         #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            RemoveOldLanguageFiles();
+            _langChangeLock.Dispose();
+        }
+
+        #endregion
     }
 }

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -22,7 +22,7 @@ public static class ImageLoader
         private static Lock storageLock { get; } = new();
         private static BinaryStorage<List<(string, bool)>> _storage;
         private static readonly ConcurrentDictionary<string, string> GuidToKey = new();
-        private static IImageHashGenerator _hashGenerator;
+        private static ImageHashGenerator _hashGenerator;
         private static readonly bool EnableImageHash = true;
         public static ImageSource Image => ImageCache[Constant.ImageIcon, false];
         public static ImageSource MissingImage => ImageCache[Constant.MissingImgIcon, false];
@@ -31,7 +31,7 @@ public static class ImageLoader
         public const int FullIconSize = 256;
         public const int FullImageSize = 320;
 
-        private static readonly string[] ImageExtensions = { ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico" };
+        private static readonly string[] ImageExtensions = [".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".ico"];
         private static readonly string SvgExtension = ".svg";
 
         public static async Task InitializeAsync()
@@ -327,7 +327,7 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
             return img;
         }
 
-        private static ImageSource LoadFullImage(string path)
+        private static BitmapImage LoadFullImage(string path)
         {
             BitmapImage image = new BitmapImage();
             image.BeginInit();
@@ -364,7 +364,7 @@ private static ImageSource LoadFullImage(string path)
             return image;
         }
 
-        private static ImageSource LoadSvgImage(string path, bool loadFullImage = false)
+        private static RenderTargetBitmap LoadSvgImage(string path, bool loadFullImage = false)
         {
             // Set up drawing settings
             var desiredHeight = loadFullImage ? FullImageSize : SmallIconSize;

Flow.Launcher/App.xaml.cs

@@ -46,6 +46,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private static Settings _settings;
         private static MainWindow _mainWindow;
         private readonly MainViewModel _mainVM;
+        private readonly Internationalization _internationalization;
 
         // To prevent two disposals running at the same time.
         private static readonly object _disposingLock = new();
@@ -111,6 +112,7 @@ public App()
                 API = Ioc.Default.GetRequiredService<IPublicAPI>();
                 _settings.Initialize();
                 _mainVM = Ioc.Default.GetRequiredService<MainViewModel>();
+                _internationalization = Ioc.Default.GetRequiredService<Internationalization>();
             }
             catch (Exception e)
             {
@@ -197,7 +199,7 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 Win32Helper.EnableWin32DarkMode(_settings.ColorScheme);
 
                 // Initialize language before portable clean up since it needs translations
-                await Ioc.Default.GetRequiredService<Internationalization>().InitializeLanguageAsync();
+                await _internationalization.InitializeLanguageAsync();
 
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
@@ -425,6 +427,7 @@ protected virtual void Dispose(bool disposing)
                     _mainWindow?.Dispatcher.Invoke(_mainWindow.Dispose);
                     _mainVM?.Dispose();
                     DialogJump.Dispose();
+                    _internationalization.Dispose();
                 }
 
                 API.LogInfo(ClassName, "End Flow Launcher dispose ----------------------------------------------------");

Flow.Launcher/Helper/WallpaperPathRetrieval.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -16,7 +17,7 @@ public static class WallpaperPathRetrieval
 
     private const int MaxCacheSize = 3;
     private static readonly Dictionary<(string, DateTime), ImageBrush> WallpaperCache = new();
-    private static readonly object CacheLock = new();
+    private static readonly Lock CacheLock = new();
 
     public static Brush GetWallpaperBrush()
     {
@@ -31,7 +32,7 @@ public static Brush GetWallpaperBrush()
             var wallpaperPath = Win32Helper.GetWallpaperPath();
             if (string.IsNullOrEmpty(wallpaperPath) || !File.Exists(wallpaperPath))
             {
-                App.API.LogInfo(ClassName, $"Wallpaper path is invalid: {wallpaperPath}");
+                App.API.LogError(ClassName, $"Wallpaper path is invalid: {wallpaperPath}");
                 var wallpaperColor = GetWallpaperColor();
                 return new SolidColorBrush(wallpaperColor);
             }
@@ -47,17 +48,22 @@ public static Brush GetWallpaperBrush()
                     return cachedWallpaper;
                 }
             }
-            
-            using var fileStream = File.OpenRead(wallpaperPath);
-            var decoder = BitmapDecoder.Create(fileStream, BitmapCreateOptions.DelayCreation, BitmapCacheOption.None);
-            var frame = decoder.Frames[0];
-            var originalWidth = frame.PixelWidth;
-            var originalHeight = frame.PixelHeight;
+
+            int originalWidth, originalHeight;
+            // Use `using ()` instead of `using var` sentence here to ensure the wallpaper file is not locked
+            using (var fileStream = File.OpenRead(wallpaperPath))
+            {
+                var decoder = BitmapDecoder.Create(fileStream, BitmapCreateOptions.DelayCreation, BitmapCacheOption.None);
+                var frame = decoder.Frames[0];
+                originalWidth = frame.PixelWidth;
+                originalHeight = frame.PixelHeight;
+            }
 
             if (originalWidth == 0 || originalHeight == 0)
             {
-                App.API.LogInfo(ClassName, $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");
-                return new SolidColorBrush(Colors.Transparent);
+                App.API.LogError(ClassName, $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");
+                var wallpaperColor = GetWallpaperColor();
+                return new SolidColorBrush(wallpaperColor);
             }
 
             // Calculate the scaling factor to fit the image within 800x600 while preserving aspect ratio
@@ -70,7 +76,9 @@ public static Brush GetWallpaperBrush()
             // Set DecodePixelWidth and DecodePixelHeight to resize the image while preserving aspect ratio
             var bitmap = new BitmapImage();
             bitmap.BeginInit();
+            bitmap.CacheOption = BitmapCacheOption.OnLoad;  // Use OnLoad to ensure the wallpaper file is not locked
             bitmap.UriSource = new Uri(wallpaperPath);
+            bitmap.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
             bitmap.DecodePixelWidth = decodedPixelWidth;
             bitmap.DecodePixelHeight = decodedPixelHeight;
             bitmap.EndInit();
@@ -104,13 +112,13 @@ public static Brush GetWallpaperBrush()
 
     private static Color GetWallpaperColor()
     {
-        RegistryKey key = Registry.CurrentUser.OpenSubKey(@"Control Panel\Colors", false);
+        using var key = Registry.CurrentUser.OpenSubKey(@"Control Panel\Colors", false);
         var result = key?.GetValue("Background", null);
         if (result is string strResult)
         {
             try
             {
-                var parts = strResult.Trim().Split(new[] { ' ' }, 3).Select(byte.Parse).ToList();
+                var parts = strResult.Trim().Split([' '], 3).Select(byte.Parse).ToList();
                 return Color.FromRgb(parts[0], parts[1], parts[2]);
             }
             catch (Exception ex)

Flow.Launcher/Languages/en.xaml

@@ -219,6 +219,7 @@
     <system:String x:Key="failedToUninstallPluginTitle">Fail to uninstall {0}</system:String>
     <system:String x:Key="fileNotFoundMessage">Unable to find plugin.json from the extracted zip file, or this path {0} does not exist</system:String>
     <system:String x:Key="pluginExistAlreadyMessage">A plugin with the same ID and version already exists, or the version is greater than this downloaded plugin</system:String>
+    <system:String x:Key="errorCreatingSettingPanel">Error creating setting panel for plugin {0}:{1}{2}</system:String>
 
     <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>

Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

@@ -231,35 +231,41 @@ private bool ClearCacheFolder()
             }
         });
 
-        // Firstly, delete plugin cache directories
-        pluginCacheDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
-            .ToList()
-            .ForEach(dir =>
-            {
-                try
-                {
-                    // Plugin may create directories in its cache directory
-                    dir.Delete(recursive: true);
-                }
-                catch (Exception e)
-                {
-                    App.API.LogException(ClassName, $"Failed to delete cache directory: {dir.Name}", e);
-                    success = false;
-                }
-            });
-
-        // Then, delete plugin directory
-        var dir = GetPluginCacheDir();
-        try
-        {
-            dir.Delete(recursive: false);
-        }
-        catch (Exception e)
+        // Check if plugin cache directory exists before attempting to delete
+        // Or it will throw DirectoryNotFoundException in `pluginCacheDirectory.EnumerateDirectories`
+        if (pluginCacheDirectory.Exists)
         {
-            App.API.LogException(ClassName, $"Failed to delete cache directory: {dir.Name}", e);
-            success = false;
+            // Firstly, delete plugin cache directories
+            pluginCacheDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
+                .ToList()
+                .ForEach(dir =>
+                {
+                    try
+                    {
+                        // Plugin may create directories in its cache directory
+                        dir.Delete(recursive: true);
+                    }
+                    catch (Exception e)
+                    {
+                        App.API.LogException(ClassName, $"Failed to delete cache directory: {dir.Name}", e);
+                        success = false;
+                    }
+                });
+
+            // Then, delete plugin directory
+            var dir = pluginCacheDirectory;
+            try
+            {
+                dir.Delete(recursive: false);
+            }
+            catch (Exception e)
+            {
+                App.API.LogException(ClassName, $"Failed to delete cache directory: {dir.Name}", e);
+                success = false;
+            }
         }
 
+        // Raise regardless to cover scenario where size needs to be recalculated if the folder is manually removed on disk.
         OnPropertyChanged(nameof(CacheFolderSize));
 
         return success;