Code cleanup & Use Flow.Launcher.Localization to improve code quality

Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs

@@ -7,10 +7,10 @@ public enum DecimalSeparator
     {
         [EnumLocalizeKey(nameof(Localize.flowlauncher_plugin_calculator_decimal_separator_use_system_locale))]
         UseSystemLocale,
-        
+
         [EnumLocalizeKey(nameof(Localize.flowlauncher_plugin_calculator_decimal_separator_dot))]
-        Dot, 
-        
+        Dot,
+
         [EnumLocalizeKey(nameof(Localize.flowlauncher_plugin_calculator_decimal_separator_comma))]
         Comma
     }

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

@@ -5,9 +5,9 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
-using Mages.Core;
-using Flow.Launcher.Plugin.Calculator.Views;
 using Flow.Launcher.Plugin.Calculator.ViewModels;
+using Flow.Launcher.Plugin.Calculator.Views;
+using Mages.Core;
 
 namespace Flow.Launcher.Plugin.Calculator
 {
@@ -26,7 +26,7 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider
         private const string IcoPath = "Images/calculator.png";
         private static readonly List<Result> EmptyResults = [];
 
-        internal static PluginInitContext Context { get; set; } = null!;
+        internal static PluginInitContext Context { get; private set; } = null!;
 
         private Settings _settings;
         private SettingsViewModel _viewModel;
@@ -57,10 +57,10 @@ public List<Result> Query(Query query)
             {
                 var search = query.Search;
                 bool isFunctionPresent = FunctionRegex.IsMatch(search);
-                
+
                 // Mages is case sensitive, so we need to convert all function names to lower case.
                 search = FunctionRegex.Replace(search, m => m.Value.ToLowerInvariant());
-                
+
                 var decimalSep = GetDecimalSeparator();
                 var groupSep = GetGroupSeparator(decimalSep);
                 var expression = NumberRegex.Replace(search, m => NormalizeNumber(m.Value, isFunctionPresent, decimalSep, groupSep));
@@ -292,7 +292,7 @@ private static string NormalizeNumber(string numberStr, bool isFunctionPresent,
                 {
                     processedStr = processedStr.Replace(decimalSep, ".");
                 }
-                
+
                 return processedStr;
             }
             else
@@ -310,7 +310,7 @@ private static string NormalizeNumber(string numberStr, bool isFunctionPresent,
                 return processedStr;
             }
         }
-        
+
         private static bool IsValidGrouping(string[] parts, int[] groupSizes)
         {
             if (parts.Length <= 1) return true;
@@ -326,7 +326,7 @@ private static bool IsValidGrouping(string[] parts, int[] groupSizes)
 
             var lastGroupSize = groupSizes.Last();
             var canRepeatLastGroup = lastGroupSize != 0;
-            
+
             int groupIndex = 0;
             for (int i = parts.Length - 1; i > 0; i--)
             {
@@ -335,7 +335,7 @@ private static bool IsValidGrouping(string[] parts, int[] groupSizes)
                 {
                     expectedSize = groupSizes[groupIndex];
                 }
-                else if(canRepeatLastGroup)
+                else if (canRepeatLastGroup)
                 {
                     expectedSize = lastGroupSize;
                 }
@@ -345,7 +345,7 @@ private static bool IsValidGrouping(string[] parts, int[] groupSizes)
                 }
 
                 if (parts[i].Length != expectedSize) return false;
-                
+
                 groupIndex++;
             }
 

Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs

@@ -1,5 +1,4 @@
-
-namespace Flow.Launcher.Plugin.Calculator;
+namespace Flow.Launcher.Plugin.Calculator;
 
 public class Settings
 {

Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj

@@ -32,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>$(NoWarn);FLSG0007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -54,5 +55,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
+  </ItemGroup>
 
 </Project>

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

@@ -5,19 +5,19 @@ namespace Flow.Launcher.Plugin.PluginIndicator
 {
     public class Main : IPlugin, IPluginI18n, IHomeQuery
     {
-        internal PluginInitContext Context { get; private set; }
+        internal static PluginInitContext Context { get; private set; }
 
-        public List<Result> Query(Query query)
+        public void Init(PluginInitContext context)
         {
-            return QueryResults(query);
+            Context = context;
         }
 
-        public List<Result> HomeQuery()
+        public List<Result> Query(Query query)
         {
-            return QueryResults();
+            return QueryResults(query);
         }
 
-        private List<Result> QueryResults(Query query = null)
+        private static List<Result> QueryResults(Query query = null)
         {
             var nonGlobalPlugins = GetNonGlobalPlugins();
             var querySearch = query?.Search ?? string.Empty;
@@ -34,7 +34,7 @@ from keyword in nonGlobalPlugins.Keys
                 select new Result
                 {
                     Title = keyword,
-                    SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_pluginindicator_result_subtitle"), plugin.Name),
+                    SubTitle = Localize.flowlauncher_plugin_pluginindicator_result_subtitle(plugin.Name),
                     Score = score,
                     IcoPath = plugin.IcoPath,
                     AutoCompleteText = $"{keyword}{Plugin.Query.TermSeparator}",
@@ -44,10 +44,10 @@ from keyword in nonGlobalPlugins.Keys
                         return false;
                     }
                 };
-            return results.ToList();
+            return [.. results];
         }
 
-        private Dictionary<string, PluginPair> GetNonGlobalPlugins()
+        private static Dictionary<string, PluginPair> GetNonGlobalPlugins()
         {
             var nonGlobalPlugins = new Dictionary<string, PluginPair>();
             foreach (var plugin in Context.API.GetAllPlugins())
@@ -66,19 +66,19 @@ private Dictionary<string, PluginPair> GetNonGlobalPlugins()
             return nonGlobalPlugins;
         }
 
-        public void Init(PluginInitContext context)
+        public string GetTranslatedPluginTitle()
         {
-            Context = context;
+            return Localize.flowlauncher_plugin_pluginindicator_plugin_name();
         }
 
-        public string GetTranslatedPluginTitle()
+        public string GetTranslatedPluginDescription()
         {
-            return Context.API.GetTranslation("flowlauncher_plugin_pluginindicator_plugin_name");
+            return Localize.flowlauncher_plugin_pluginindicator_plugin_description();
         }
 
-        public string GetTranslatedPluginDescription()
+        public List<Result> HomeQuery()
         {
-            return Context.API.GetTranslation("flowlauncher_plugin_pluginindicator_plugin_description");
+            return QueryResults();
         }
     }
 }

Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj

@@ -35,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>$(NoWarn);FLSG0007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -52,6 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.205">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

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

@@ -9,19 +9,19 @@
 {
     public class Main : IPlugin, IPluginI18n, IContextMenu, ISettingProvider
     {
-        private readonly ProcessHelper processHelper = new();
+        internal static PluginInitContext Context { get; private set; }
 
-        private static PluginInitContext _context;
+        private Settings _settings;
 
-        internal Settings Settings;
+        private readonly ProcessHelper processHelper = new();
 
         private SettingsViewModel _viewModel;
 
         public void Init(PluginInitContext context)
         {
-            _context = context;
-            Settings = context.API.LoadSettingJsonStorage<Settings>();
-            _viewModel = new SettingsViewModel(Settings);
+            Context = context;
+            _settings = context.API.LoadSettingJsonStorage<Settings>();
+            _viewModel = new SettingsViewModel(_settings);
         }
 
         public List<Result> Query(Query query)
@@ -31,12 +31,12 @@
 
         public string GetTranslatedPluginTitle()
         {
-            return _context.API.GetTranslation("flowlauncher_plugin_processkiller_plugin_name");
+            return Localize.flowlauncher_plugin_processkiller_plugin_name();
         }
 
         public string GetTranslatedPluginDescription()
         {
-            return _context.API.GetTranslation("flowlauncher_plugin_processkiller_plugin_description");
+            return Localize.flowlauncher_plugin_processkiller_plugin_description();
         }
 
         public List<Result> LoadContextMenus(Result result)
@@ -51,13 +51,13 @@
             {
                 menuOptions.Add(new Result
                 {
-                    Title = _context.API.GetTranslation("flowlauncher_plugin_processkiller_kill_instances"),
+                    Title = Localize.flowlauncher_plugin_processkiller_kill_instances(),
                     SubTitle = processPath,
                     Action = _ =>
                     {
                         foreach (var p in similarProcesses)
                         {
-                            processHelper.TryKill(_context, p);
+                            ProcessHelper.TryKill(p);
                         }
 
                         return true;
@@ -72,8 +72,8 @@
         private List<Result> CreateResultsFromQuery(Query query)
         {
             // Get all non-system processes
-            var allPocessList = processHelper.GetMatchingProcesses();
-            if (!allPocessList.Any())
+            var allProcessList = processHelper.GetMatchingProcesses();
+            if (allProcessList.Count == 0)
             {
                 return null;
             }
@@ -82,12 +82,12 @@
             var searchTerm = query.Search;
             var processlist = new List<ProcessResult>();
             var processWindowTitle =
-                Settings.ShowWindowTitle || Settings.PutVisibleWindowProcessesTop ?
+                _settings.ShowWindowTitle || _settings.PutVisibleWindowProcessesTop ?
                 ProcessHelper.GetProcessesWithNonEmptyWindowTitle() :
-                new Dictionary<int, string>();
+                [];
             if (string.IsNullOrWhiteSpace(searchTerm))
             {
-                foreach (var p in allPocessList)
+                foreach (var p in allProcessList)
                 {
                     var progressNameIdTitle = ProcessHelper.GetProcessNameIdTitle(p);
 
@@ -95,16 +95,16 @@
                     {
                         // Add score to prioritize processes with visible windows
                         // Use window title for those processes if enabled
                         processlist.Add(new ProcessResult(
                             p,
-                            Settings.PutVisibleWindowProcessesTop ? 200 : 0,
-                            Settings.ShowWindowTitle ? windowTitle : progressNameIdTitle,
+                            _settings.PutVisibleWindowProcessesTop ? 200 : 0,
+                            _settings.ShowWindowTitle ? windowTitle : progressNameIdTitle,
                             null,
                             progressNameIdTitle));
                     }
                     else
                     {
                         processlist.Add(new ProcessResult(
                             p,
                             0,
                             progressNameIdTitle,
@@ -115,39 +115,39 @@
             }
             else
             {
-                foreach (var p in allPocessList)
+                foreach (var p in allProcessList)
                 {
                     var progressNameIdTitle = ProcessHelper.GetProcessNameIdTitle(p);
 
                     if (processWindowTitle.TryGetValue(p.Id, out var windowTitle))
                     {
                         // Get max score from searching process name, window title and process id
-                        var windowTitleMatch = _context.API.FuzzySearch(searchTerm, windowTitle);
-                        var processNameIdMatch = _context.API.FuzzySearch(searchTerm, progressNameIdTitle);
+                        var windowTitleMatch = Context.API.FuzzySearch(searchTerm, windowTitle);
+                        var processNameIdMatch = Context.API.FuzzySearch(searchTerm, progressNameIdTitle);
                         var score = Math.Max(windowTitleMatch.Score, processNameIdMatch.Score);
                         if (score > 0)
                         {
                             // Add score to prioritize processes with visible windows
                             // Use window title for those processes
-                            if (Settings.PutVisibleWindowProcessesTop)
+                            if (_settings.PutVisibleWindowProcessesTop)
                             {
                                 score += 200;
                             }
                             processlist.Add(new ProcessResult(
                                 p,
                                 score,
-                                Settings.ShowWindowTitle ? windowTitle : progressNameIdTitle,
+                                _settings.ShowWindowTitle ? windowTitle : progressNameIdTitle,
                                 score == windowTitleMatch.Score ? windowTitleMatch : null,
                                 progressNameIdTitle));
                         }
                     }
                     else
                     {
-                        var processNameIdMatch = _context.API.FuzzySearch(searchTerm, progressNameIdTitle);
+                        var processNameIdMatch = Context.API.FuzzySearch(searchTerm, progressNameIdTitle);
                         var score = processNameIdMatch.Score;
                         if (score > 0)
                         {
                             processlist.Add(new ProcessResult(
                                 p,
                                 score,
                                 progressNameIdTitle,
@@ -162,7 +162,7 @@
             foreach (var pr in processlist)
             {
                 var p = pr.Process;
-                var path = processHelper.TryGetProcessFilename(p);
+                var path = ProcessHelper.TryGetProcessFilename(p);
                 results.Add(new Result()
                 {
                     IcoPath = path,
@@ -172,12 +172,12 @@
                     TitleHighlightData = pr.TitleMatch?.MatchData,
                     Score = pr.Score,
                     ContextData = p.ProcessName,
-                    AutoCompleteText = $"{_context.CurrentPluginMetadata.ActionKeyword}{Plugin.Query.TermSeparator}{p.ProcessName}",
+                    AutoCompleteText = $"{Context.CurrentPluginMetadata.ActionKeyword}{Plugin.Query.TermSeparator}{p.ProcessName}",
                     Action = (c) =>
                     {
-                        processHelper.TryKill(_context, p);
+                        ProcessHelper.TryKill(p);
                         // Re-query to refresh process list
-                        _context.API.ReQuery();
+                        Context.API.ReQuery();
                         return true;
                     }
                 });
@@ -194,17 +194,17 @@
                 sortedResults.Insert(1, new Result()
                 {
                     IcoPath = firstResult?.IcoPath,
-                    Title = string.Format(_context.API.GetTranslation("flowlauncher_plugin_processkiller_kill_all"), firstResult?.ContextData),
-                    SubTitle = string.Format(_context.API.GetTranslation("flowlauncher_plugin_processkiller_kill_all_count"), processlist.Count),
+                    Title = Localize.flowlauncher_plugin_processkiller_kill_all(firstResult?.ContextData),
+                    SubTitle = Localize.flowlauncher_plugin_processkiller_kill_all_count(processlist.Count),
                     Score = 200,
                     Action = (c) =>
                     {
                         foreach (var p in processlist)
                         {
-                            processHelper.TryKill(_context, p.Process);
+                            ProcessHelper.TryKill(p.Process);
                         }
                         // Re-query to refresh process list
-                        _context.API.ReQuery();
+                        Context.API.ReQuery();
                         return true;
                     }
                 });