Use Flow.Launcher.Localization to improve code quality

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

@@ -45,7 +45,7 @@
             }
             catch (Exception ex)
             {
-                Main._context.API.LogException(ClassName, $"Failed to register bookmark file monitoring: {bookmarkPath}", ex);
+                Main.Context.API.LogException(ClassName, $"Failed to register bookmark file monitoring: {bookmarkPath}", ex);
                 continue;
             }
 
@@ -55,12 +55,12 @@
             // Load favicons after loading bookmarks
             if (Main._settings.EnableFavicons)
             {
                 var faviconDbPath = Path.Combine(profile, "Favicons");
                 if (File.Exists(faviconDbPath))
                 {
-                    Main._context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favicons cost", () =>
+                    Main.Context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favicons cost", () =>
                     {
                         LoadFaviconsFromDb(faviconDbPath, profileBookmarks);
                     });
                 }
             }
@@ -125,19 +125,19 @@
             }
             else
             {
-                Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
+                Main.Context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
             }
         }
     }
 
     private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
     {
         FaviconHelper.LoadFaviconsFromDb(_faviconCacheDir, dbPath, (tempDbPath) =>
         {
             // Since some bookmarks may have same favicon id, we need to record them to avoid duplicates
             var savedPaths = new ConcurrentDictionary<string, bool>();
 
             // Get favicons based on bookmarks concurrently
             Parallel.ForEach(bookmarks, bookmark =>
             {
                 // Use read-only connection to avoid locking issues
@@ -159,7 +159,7 @@
                     using var cmd = connection.CreateCommand();
                     cmd.CommandText = @"
                         SELECT f.id, b.image_data
                         FROM favicons f
                         JOIN favicon_bitmaps b ON f.id = b.icon_id
                         JOIN icon_mapping m ON f.id = m.icon_id
                         WHERE m.page_url LIKE @url
@@ -180,7 +180,7 @@
 
                     var faviconPath = Path.Combine(_faviconCacheDir, $"chromium_{domain}_{iconId}.png");
 
                     // Filter out duplicate favicons
                     if (savedPaths.TryAdd(faviconPath, true))
                     {
                         FaviconHelper.SaveBitmapData(imageData, faviconPath);
@@ -190,7 +190,7 @@
                 }
                 catch (Exception ex)
                 {
-                    Main._context.API.LogException(ClassName, $"Failed to extract bookmark favicon: {bookmark.Url}", ex);
+                    Main.Context.API.LogException(ClassName, $"Failed to extract bookmark favicon: {bookmark.Url}", ex);
                 }
                 finally
                 {

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs

@@ -9,11 +9,11 @@
 {
     internal static MatchResult MatchProgram(Bookmark bookmark, string queryString)
     {
-        var match = Main._context.API.FuzzySearch(queryString, bookmark.Name);
+        var match = Main.Context.API.FuzzySearch(queryString, bookmark.Name);
         if (match.IsSearchPrecisionScoreMet())
             return match;
 
-        return Main._context.API.FuzzySearch(queryString, bookmark.Url);
+        return Main.Context.API.FuzzySearch(queryString, bookmark.Url);
     }
 
     internal static List<Bookmark> LoadAllBookmarks(Settings setting)
@@ -31,7 +31,7 @@
         {
             // Add Firefox bookmarks
             var mozBookmarks = new FirefoxBookmarkLoader();
             allBookmarks.AddRange(mozBookmarks.GetBookmarks());
         }
 
         if (setting.LoadEdgeBookmark)

Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs

@@ -25,7 +25,7 @@
 
     // Updated query - removed favicon_id column
     private const string QueryAllBookmarks = """
         SELECT moz_places.url, moz_bookmarks.title
         FROM moz_places
             INNER JOIN moz_bookmarks ON (
                 moz_bookmarks.fk NOT NULL AND moz_bookmarks.title NOT NULL AND moz_bookmarks.fk = moz_places.id
@@ -49,7 +49,7 @@
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to register Firefox bookmark file monitoring: {placesPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to register Firefox bookmark file monitoring: {placesPath}", ex);
             return bookmarks;
         }
 
@@ -84,7 +84,7 @@
                 var faviconDbPath = Path.Combine(Path.GetDirectoryName(placesPath), "favicons.sqlite");
                 if (File.Exists(faviconDbPath))
                 {
-                    Main._context.API.StopwatchLogInfo(ClassName, $"Load {bookmarks.Count} favicons cost", () =>
+                    Main.Context.API.StopwatchLogInfo(ClassName, $"Load {bookmarks.Count} favicons cost", () =>
                     {
                         LoadFaviconsFromDb(faviconDbPath, bookmarks);
                     });
@@ -98,7 +98,7 @@
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to load Firefox bookmarks: {placesPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to load Firefox bookmarks: {placesPath}", ex);
         }
 
         // Delete temporary file
@@ -111,7 +111,7 @@
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex);
         }
 
         return bookmarks;
@@ -186,7 +186,7 @@
                 }
                 catch (Exception ex)
                 {
-                    Main._context.API.LogException(ClassName, $"Failed to extract Firefox favicon: {bookmark.Url}", ex);
+                    Main.Context.API.LogException(ClassName, $"Failed to extract Firefox favicon: {bookmark.Url}", ex);
                 }
                 finally
                 {

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -81,7 +81,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
@@ -96,6 +95,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="Flow.Launcher.Localization" Version="0.0.3" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
   </ItemGroup>
 

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Helper/FaviconHelper.cs

@@ -27,9 +27,9 @@ public static void LoadFaviconsFromDb(string faviconCacheDir, string dbPath, Act
             }
             catch (Exception ex1)
             {
-                Main._context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex1);
+                Main.Context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex1);
             }
-            Main._context.API.LogException(ClassName, $"Failed to copy favicon DB: {dbPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to copy favicon DB: {dbPath}", ex);
             return;
         }
 
@@ -39,7 +39,7 @@ public static void LoadFaviconsFromDb(string faviconCacheDir, string dbPath, Act
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to connect to SQLite: {tempDbPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to connect to SQLite: {tempDbPath}", ex);
         }
 
         // Delete temporary file
@@ -49,7 +49,7 @@ public static void LoadFaviconsFromDb(string faviconCacheDir, string dbPath, Act
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to delete temporary favicon DB: {tempDbPath}", ex);
         }
     }
 
@@ -61,7 +61,7 @@ public static void SaveBitmapData(byte[] imageData, string outputPath)
         }
         catch (Exception ex)
         {
-            Main._context.API.LogException(ClassName, $"Failed to save image: {outputPath}", ex);
+            Main.Context.API.LogException(ClassName, $"Failed to save image: {outputPath}", ex);
         }
     }
 

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs

@@ -19,7 +19,7 @@ public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContex
 
     internal static string _faviconCacheDir;
 
-    internal static PluginInitContext _context;
+    internal static PluginInitContext Context { get; set; }
 
     internal static Settings _settings;
 
@@ -29,7 +29,7 @@ public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContex
 
     public void Init(PluginInitContext context)
     {
-        _context = context;
+        Context = context;
 
         _settings = context.API.LoadSettingJsonStorage<Settings>();
 
@@ -42,7 +42,7 @@ public void Init(PluginInitContext context)
 
     private static void LoadBookmarksIfEnabled()
     {
-        if (_context.CurrentPluginMetadata.Disabled)
+        if (Context.CurrentPluginMetadata.Disabled)
         {
             // Don't load or monitor files if disabled
             return;
@@ -84,7 +84,7 @@ public List<Result> Query(Query query)
                         Score = BookmarkLoader.MatchProgram(c, param).Score,
                         Action = _ =>
                         {
-                            _context.API.OpenUrl(c.Url);
+                            Context.API.OpenUrl(c.Url);
 
                             return true;
                         },
@@ -108,7 +108,7 @@ public List<Result> Query(Query query)
                         Score = 5,
                         Action = _ =>
                         {
-                            _context.API.OpenUrl(c.Url);
+                            Context.API.OpenUrl(c.Url);
                             return true;
                         },
                         ContextData = new BookmarkAttributes { Url = c.Url }
@@ -192,12 +192,12 @@ public static void ReloadAllBookmarks(bool disposeFileWatchers = true)
 
     public string GetTranslatedPluginTitle()
     {
-        return _context.API.GetTranslation("flowlauncher_plugin_browserbookmark_plugin_name");
+        return Localize.flowlauncher_plugin_browserbookmark_plugin_name();
     }
 
     public string GetTranslatedPluginDescription()
     {
-        return _context.API.GetTranslation("flowlauncher_plugin_browserbookmark_plugin_description");
+        return Localize.flowlauncher_plugin_browserbookmark_plugin_description();
     }
 
     public Control CreateSettingPanel()
@@ -211,22 +211,22 @@ public List<Result> LoadContextMenus(Result selectedResult)
         {
             new()
             {
-                Title = _context.API.GetTranslation("flowlauncher_plugin_browserbookmark_copyurl_title"),
-                SubTitle = _context.API.GetTranslation("flowlauncher_plugin_browserbookmark_copyurl_subtitle"),
+                Title = Localize.flowlauncher_plugin_browserbookmark_copyurl_title(),
+                SubTitle = Localize.flowlauncher_plugin_browserbookmark_copyurl_subtitle(),
                 Action = _ =>
                 {
                     try
                     {
-                        _context.API.CopyToClipboard(((BookmarkAttributes)selectedResult.ContextData).Url);
+                        Context.API.CopyToClipboard(((BookmarkAttributes)selectedResult.ContextData).Url);
 
                         return true;
                     }
                     catch (Exception e)
                     {
                         var message = "Failed to set url in clipboard";
-                        _context.API.LogException(ClassName, message, e);
+                        Context.API.LogException(ClassName, message, e);
 
-                        _context.API.ShowMsg(message);
+                        Context.API.ShowMsg(message);
 
                         return false;
                     }

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/CustomBrowser.cs

@@ -1,4 +1,7 @@
-namespace Flow.Launcher.Plugin.BrowserBookmark.Models;
+using System.Collections.Generic;
+using Flow.Launcher.Localization.Attributes;
+
+namespace Flow.Launcher.Plugin.BrowserBookmark.Models;
 
 public class CustomBrowser : BaseModel
 {
@@ -11,8 +14,11 @@ public string Name
         get => _name;
         set
         {
-            _name = value;
-            OnPropertyChanged();
+            if (_name != value)
+            {
+                _name = value;
+                OnPropertyChanged();
+            }
         }
     }
 
@@ -21,24 +27,36 @@ public string DataDirectoryPath
         get => _dataDirectoryPath;
         set
         {
-            _dataDirectoryPath = value;
-            OnPropertyChanged();
+            if (_dataDirectoryPath != value)
+            {
+                _dataDirectoryPath = value;
+                OnPropertyChanged();
+            }
         }
     }
 
+    public List<BrowserTypeLocalized> AllBrowserTypes { get; } = BrowserTypeLocalized.GetValues();
+
     public BrowserType BrowserType
     {
         get => _browserType;
         set
         {
-            _browserType = value;
-            OnPropertyChanged();
+            if (_browserType != value)
+            {
+                _browserType = value;
+                OnPropertyChanged();
+            }
         }
     }
 }
 
+[EnumLocalize]
 public enum BrowserType
 {
+    [EnumLocalizeValue("Chromium")]
     Chromium,
+
+    [EnumLocalizeValue("Firefox")]
     Firefox,
 }