Improve code quality

Jack251970 · Jack251970 · commit 9c07989edf4f · 2025-04-09T12:14:07.000+08:00
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text.Json;
 using System;
-using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Microsoft.Data.Sqlite;
 
@@ -116,8 +115,7 @@ private static void EnumerateFolderBookmark(JsonElement folderElement, ICollecti
             }
             else
             {
-                Log.Error(
-                    $"ChromiumBookmarkLoader: EnumerateFolderBookmark: type property not found for {subElement.GetString()}");
+                Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
             }
         }
     }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
-using System.Linq;
 using Flow.Launcher.Plugin.Explorer.Helper;
 using Flow.Launcher.Plugin.Explorer.ViewModels;
 
@@ -470,22 +469,16 @@ private Result CreateOpenWithMenu(SearchResult record)
 
         private void LogException(string message, Exception e)
         {
-            Log.Exception($"|Flow.Launcher.Plugin.Folder.ContextMenu|{message}", e);
+            Context.API.LogException(nameof(Main), message, e);
         }
 
-        private bool CanRunAsDifferentUser(string path)
+        private static bool CanRunAsDifferentUser(string path)
         {
-            switch (Path.GetExtension(path))
+            return Path.GetExtension(path) switch
             {
-                case ".exe":
-                case ".bat":
-                case ".msi":
-                    return true;
-
-                default:
-                    return false;
-
-            }
+                ".exe" or ".bat" or ".msi" => true,
+                _ => false,
+            };
         }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
@@ -1,10 +1,9 @@
-using Flow.Launcher.Infrastructure.Logger;
-using Flow.Launcher.Plugin.SharedCommands;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
 {
@@ -76,7 +75,7 @@ private static IEnumerable<SearchResult> DirectorySearch(EnumerationOptions enum
             }
             catch (Exception e)
             {
-                Log.Exception(nameof(DirectoryInfoSearch), "Error occurred while searching path", e);
+                Main.Context.API.LogException(nameof(DirectoryInfoSearch), "Error occurred while searching path", e);
                 
                 throw;
             }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/WindowsIndex.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/WindowsIndex.cs
@@ -1,6 +1,4 @@
-﻿using Flow.Launcher.Infrastructure.Logger;
-using Microsoft.Search.Interop;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Data.OleDb;
 using System.Linq;
@@ -9,11 +7,13 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using Flow.Launcher.Plugin.Explorer.Exceptions;
+using Microsoft.Search.Interop;
 
 namespace Flow.Launcher.Plugin.Explorer.Search.WindowsIndex
 {
     internal static class WindowsIndex
     {
+        private static readonly string ClassName = nameof(WindowsIndex);
 
         // Reserved keywords in oleDB
         private static Regex _reservedPatternMatcher = new(@"^[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+$", RegexOptions.Compiled);
@@ -33,7 +33,7 @@ private static async IAsyncEnumerable<SearchResult> ExecuteWindowsIndexSearchAsy
             }
             catch (OleDbException e)
             {
-                Log.Exception($"|WindowsIndex.ExecuteWindowsIndexSearchAsync|Failed to execute windows index search query: {indexQueryString}", e);
+                Main.Context.API.LogException(ClassName, $"Failed to execute windows index search query: {indexQueryString}", e);
                 yield break;
             }
             await using var dataReader = dataReaderAttempt;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Controls;
-using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin.Program.Programs;
 using Flow.Launcher.Plugin.Program.Views;
@@ -20,6 +19,8 @@ namespace Flow.Launcher.Plugin.Program
 {
     public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, IAsyncReloadable, IDisposable
     {
+        private static readonly string ClassName = nameof(Main);
+
         private const string Win32CacheName = "Win32";
         private const string UwpCacheName = "UWP";
 
@@ -109,7 +110,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
                     }
                     catch (OperationCanceledException)
                     {
-                        Log.Debug("|Flow.Launcher.Plugin.Program.Main|Query operation cancelled");
+                        Context.API.LogDebug(ClassName, "Query operation cancelled");
                         return emptyResults;
                     }
                     finally
@@ -253,8 +254,8 @@ static void MoveFile(string sourcePath, string destinationPath)
                 _uwpsCount = _uwps.Count;
                 _uwpsLock.Release();
             });
-            Log.Info($"|Flow.Launcher.Plugin.Program.Main|Number of preload win32 programs <{_win32sCount}>");
-            Log.Info($"|Flow.Launcher.Plugin.Program.Main|Number of preload uwps <{_uwpsCount}>");
+            Context.API.LogInfo(ClassName, "Number of preload win32 programs <{_win32sCount}>");
+            Context.API.LogInfo(ClassName, "Number of preload uwps <{_uwpsCount}>");
 
             var cacheEmpty = _win32sCount == 0 || _uwpsCount == 0;
 
@@ -295,7 +296,7 @@ public static async Task IndexWin32ProgramsAsync()
             }
             catch (Exception e)
             {
-                Log.Exception("|Flow.Launcher.Plugin.Program.Main|Failed to index Win32 programs", e);
+                Context.API.LogException(ClassName, "Failed to index Win32 programs", e);
             }
             finally
             {
@@ -320,7 +321,7 @@ public static async Task IndexUwpProgramsAsync()
             }
             catch (Exception e)
             {
-                Log.Exception("|Flow.Launcher.Plugin.Program.Main|Failed to index Uwp programs", e);
+                Context.API.LogException(ClassName, "Failed to index Uwp programs", e);
             }
             finally
             {
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -8,7 +8,6 @@
 using WindowsInput;
 using WindowsInput.Native;
 using Flow.Launcher.Infrastructure.Hotkey;
-using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
 using Control = System.Windows.Controls.Control;
 using Keys = System.Windows.Forms.Keys;
@@ -17,8 +16,11 @@ namespace Flow.Launcher.Plugin.Shell
 {
     public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu
     {
+        private static readonly string ClassName = nameof(Main);
+
+        internal PluginInitContext Context { get; private set; }
+
         private const string Image = "Images/shell.png";
-        private PluginInitContext context;
         private bool _winRStroked;
         private readonly KeyboardSimulator _keyboardSimulator = new KeyboardSimulator(new InputSimulator());
 
@@ -88,7 +90,7 @@ public List<Result> Query(Query query)
                 }
                 catch (Exception e)
                 {
-                    Log.Exception($"|Flow.Launcher.Plugin.Shell.Main.Query|Exception when query for <{query}>", e);
+                    Context.API.LogException(ClassName, $"Exception when query for <{query}>", e);
                 }
                 return results;
             }
@@ -102,14 +104,14 @@ private List<Result> GetHistoryCmds(string cmd, Result result)
                 {
                     if (m.Key == cmd)
                     {
-                        result.SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value);
+                        result.SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value);
                         return null;
                     }
 
                     var ret = new Result
                     {
                         Title = m.Key,
-                        SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),
+                        SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),
                         IcoPath = Image,
                         Action = c =>
                         {
@@ -139,7 +141,7 @@ private Result GetCurrentCmd(string cmd)
             {
                 Title = cmd,
                 Score = 5000,
-                SubTitle = context.API.GetTranslation("flowlauncher_plugin_cmd_execute_through_shell"),
+                SubTitle = Context.API.GetTranslation("flowlauncher_plugin_cmd_execute_through_shell"),
                 IcoPath = Image,
                 Action = c =>
                 {
@@ -164,7 +166,7 @@ private List<Result> ResultsFromHistory()
                 .Select(m => new Result
                 {
                     Title = m.Key,
-                    SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),
+                    SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),
                     IcoPath = Image,
                     Action = c =>
                     {
@@ -211,7 +213,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
                         info.FileName = "cmd.exe";
                     }
 
-                    info.ArgumentList.Add($"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command} {(_settings.CloseShellAfterPress ? $"&& echo {context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")} && pause > nul /c" : "")}");
+                    info.ArgumentList.Add($"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command} {(_settings.CloseShellAfterPress ? $"&& echo {Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")} && pause > nul /c" : "")}");
                     break;
                 }
 
@@ -234,7 +236,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
                     else
                     {
                         info.ArgumentList.Add("-Command");
-                        info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");
+                        info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");
                     }
                     break;
                 }
@@ -255,7 +257,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin
                         info.ArgumentList.Add("-NoExit");
                     }
                     info.ArgumentList.Add("-Command");
-                    info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");
+                    info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");
                     break;
                 }
 
@@ -309,13 +311,13 @@ private void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartI
             {
                 var name = "Plugin: Shell";
                 var message = $"Command not found: {e.Message}";
-                context.API.ShowMsg(name, message);
+                Context.API.ShowMsg(name, message);
             }
             catch (Win32Exception e)
             {
                 var name = "Plugin: Shell";
                 var message = $"Error running the command: {e.Message}";
-                context.API.ShowMsg(name, message);
+                Context.API.ShowMsg(name, message);
             }
         }
 
@@ -350,14 +352,14 @@ private bool ExistInPath(string filename)
 
         public void Init(PluginInitContext context)
         {
-            this.context = context;
+            Context = context;
             _settings = context.API.LoadSettingJsonStorage<Settings>();
             context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);
         }
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
         {
-            if (!context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)
+            if (!Context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)
             {
                 if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)
                 {
@@ -380,10 +382,9 @@ private void OnWinRPressed()
             // show the main window and set focus to the query box
             _ = Task.Run(() =>
             {
-                context.API.ShowMainWindow();
-                context.API.ChangeQuery($"{context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");
+                Context.API.ShowMainWindow();
+                Context.API.ChangeQuery($"{Context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");
             });
-
         }
 
         public Control CreateSettingPanel()
@@ -393,12 +394,12 @@ public Control CreateSettingPanel()
 
         public string GetTranslatedPluginTitle()
         {
-            return context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_name");
+            return Context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_name");
         }
 
         public string GetTranslatedPluginDescription()
         {
-            return context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_description");
+            return Context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_description");
         }
 
         public List<Result> LoadContextMenus(Result selectedResult)
@@ -407,8 +408,8 @@ public List<Result> LoadContextMenus(Result selectedResult)
             {
                 new()
                 {
-                    Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"),
-                    AsyncAction = async c =>
+                    Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"),
+                    Action = c =>
                     {
                         Execute(ShellCommand.RunAsDifferentUser, PrepareProcessStartInfo(selectedResult.Title));
                         return true;
@@ -418,7 +419,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
                 },
                 new()
                 {
-                    Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_administrator"),
+                    Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_administrator"),
                     Action = c =>
                     {
                         Execute(Process.Start, PrepareProcessStartInfo(selectedResult.Title, true));
@@ -429,10 +430,10 @@ public List<Result> LoadContextMenus(Result selectedResult)
                 },
                 new()
                 {
-                    Title = context.API.GetTranslation("flowlauncher_plugin_cmd_copy"),
+                    Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_copy"),
                     Action = c =>
                     {
-                        context.API.CopyToClipboard(selectedResult.Title);
+                        Context.API.CopyToClipboard(selectedResult.Title);
                         return true;
                     },
                     IcoPath = "Images/copy.png",
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -6,7 +6,6 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Windows.Win32;
 using Windows.Win32.Foundation;
@@ -19,6 +18,8 @@ namespace Flow.Launcher.Plugin.Sys
 {
     public class Main : IPlugin, ISettingProvider, IPluginI18n
     {
+        private static readonly string ClassName = nameof(Main);
+
         private readonly Dictionary<string, string> KeywordTitleMappings = new()
         {
             {"Shutdown", "flowlauncher_plugin_sys_shutdown_computer_cmd"},
@@ -106,7 +107,7 @@ private string GetTitle(string key)
         {
             if (!KeywordTitleMappings.TryGetValue(key, out var translationKey))
             {
-                Log.Error("Flow.Launcher.Plugin.Sys.Main", $"Title not found for: {key}");
+                _context.API.LogError(ClassName, $"Title not found for: {key}");
                 return "Title Not Found";
             }
 
@@ -117,7 +118,7 @@ private string GetDescription(string key)
         {
             if (!KeywordDescriptionMappings.TryGetValue(key, out var translationKey))
             {
-                Log.Error("Flow.Launcher.Plugin.Sys.Main", $"Description not found for: {key}");
+                _context.API.LogError(ClassName, $"Description not found for: {key}");
                 return "Description Not Found";
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Text.Json;`
`4`	`4`	`using System;`
`5`		`-using Flow.Launcher.Infrastructure.Logger;`
`6`	`5`	`using Flow.Launcher.Plugin.BrowserBookmark.Models;`
`7`	`6`	`using Microsoft.Data.Sqlite;`
`8`	`7`
`@@ -116,8 +115,7 @@ private static void EnumerateFolderBookmark(JsonElement folderElement, ICollecti`
`116`	`115`	`}`
`117`	`116`	`else`
`118`	`117`	`{`
`119`		`- Log.Error(`
`120`		`- $"ChromiumBookmarkLoader: EnumerateFolderBookmark: type property not found for {subElement.GetString()}");`
	`118`	`+ Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");`
`121`	`119`	`}`
`122`	`120`	`}`
`123`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`		`-using Flow.Launcher.Infrastructure.Logger;`
`2`		`-using Flow.Launcher.Plugin.SharedCommands;`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Collections.Generic;`
`5`	`3`	`using System.IO;`
`6`	`4`	`using System.Linq;`
`7`	`5`	`using System.Threading;`
	`6`	`+using Flow.Launcher.Plugin.SharedCommands;`
`8`	`7`
`9`	`8`	`namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo`
`10`	`9`	`{`
`@@ -76,7 +75,7 @@ private static IEnumerable<SearchResult> DirectorySearch(EnumerationOptions enum`
`76`	`75`	`}`
`77`	`76`	`catch (Exception e)`
`78`	`77`	`{`
`79`		`- Log.Exception(nameof(DirectoryInfoSearch), "Error occurred while searching path", e);`
	`78`	`+ Main.Context.API.LogException(nameof(DirectoryInfoSearch), "Error occurred while searching path", e);`
`80`	`79`
`81`	`80`	`throw;`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Flow.Launcher.Infrastructure.Logger;`
`2`		`-using Microsoft.Search.Interop;`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Collections.Generic;`
`5`	`3`	`using System.Data.OleDb;`
`6`	`4`	`using System.Linq;`
`@@ -9,11 +7,13 @@`
`9`	`7`	`using System.Text.RegularExpressions;`
`10`	`8`	`using System.Threading;`
`11`	`9`	`using Flow.Launcher.Plugin.Explorer.Exceptions;`
	`10`	`+using Microsoft.Search.Interop;`
`12`	`11`
`13`	`12`	`namespace Flow.Launcher.Plugin.Explorer.Search.WindowsIndex`
`14`	`13`	`{`
`15`	`14`	`internal static class WindowsIndex`
`16`	`15`	`{`
	`16`	`+ private static readonly string ClassName = nameof(WindowsIndex);`
`17`	`17`
`18`	`18`	`// Reserved keywords in oleDB`
`19`	`19`	private static Regex _reservedPatternMatcher = new(@"^[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+$", RegexOptions.Compiled);
`@@ -33,7 +33,7 @@ private static async IAsyncEnumerable<SearchResult> ExecuteWindowsIndexSearchAsy`
`33`	`33`	`}`
`34`	`34`	`catch (OleDbException e)`
`35`	`35`	`{`
`36`		`- Log.Exception($"\|WindowsIndex.ExecuteWindowsIndexSearchAsync\|Failed to execute windows index search query: {indexQueryString}", e);`
	`36`	`+ Main.Context.API.LogException(ClassName, $"Failed to execute windows index search query: {indexQueryString}", e);`
`37`	`37`	`yield break;`
`38`	`38`	`}`
`39`	`39`	`await using var dataReader = dataReaderAttempt;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using System.Windows.Controls;`
`9`		`-using Flow.Launcher.Infrastructure.Logger;`
`10`	`9`	`using Flow.Launcher.Infrastructure.UserSettings;`
`11`	`10`	`using Flow.Launcher.Plugin.Program.Programs;`
`12`	`11`	`using Flow.Launcher.Plugin.Program.Views;`
`@@ -20,6 +19,8 @@ namespace Flow.Launcher.Plugin.Program`
`20`	`19`	`{`
`21`	`20`	`public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, IAsyncReloadable, IDisposable`
`22`	`21`	`{`
	`22`	`+ private static readonly string ClassName = nameof(Main);`
	`23`	`+`
`23`	`24`	`private const string Win32CacheName = "Win32";`
`24`	`25`	`private const string UwpCacheName = "UWP";`
`25`	`26`
`@@ -109,7 +110,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)`
`109`	`110`	`}`
`110`	`111`	`catch (OperationCanceledException)`
`111`	`112`	`{`
`112`		`- Log.Debug("\|Flow.Launcher.Plugin.Program.Main\|Query operation cancelled");`
	`113`	`+ Context.API.LogDebug(ClassName, "Query operation cancelled");`
`113`	`114`	`return emptyResults;`
`114`	`115`	`}`
`115`	`116`	`finally`
`@@ -253,8 +254,8 @@ static void MoveFile(string sourcePath, string destinationPath)`
`253`	`254`	`_uwpsCount = _uwps.Count;`
`254`	`255`	`_uwpsLock.Release();`
`255`	`256`	`});`
`256`		`- Log.Info($"\|Flow.Launcher.Plugin.Program.Main\|Number of preload win32 programs <{_win32sCount}>");`
`257`		`- Log.Info($"\|Flow.Launcher.Plugin.Program.Main\|Number of preload uwps <{_uwpsCount}>");`
	`257`	`+ Context.API.LogInfo(ClassName, "Number of preload win32 programs <{_win32sCount}>");`
	`258`	`+ Context.API.LogInfo(ClassName, "Number of preload uwps <{_uwpsCount}>");`
`258`	`259`
`259`	`260`	`var cacheEmpty = _win32sCount == 0 \|\| _uwpsCount == 0;`
`260`	`261`
`@@ -295,7 +296,7 @@ public static async Task IndexWin32ProgramsAsync()`
`295`	`296`	`}`
`296`	`297`	`catch (Exception e)`
`297`	`298`	`{`
`298`		`- Log.Exception("\|Flow.Launcher.Plugin.Program.Main\|Failed to index Win32 programs", e);`
	`299`	`+ Context.API.LogException(ClassName, "Failed to index Win32 programs", e);`
`299`	`300`	`}`
`300`	`301`	`finally`
`301`	`302`	`{`
`@@ -320,7 +321,7 @@ public static async Task IndexUwpProgramsAsync()`
`320`	`321`	`}`
`321`	`322`	`catch (Exception e)`
`322`	`323`	`{`
`323`		`- Log.Exception("\|Flow.Launcher.Plugin.Program.Main\|Failed to index Uwp programs", e);`
	`324`	`+ Context.API.LogException(ClassName, "Failed to index Uwp programs", e);`
`324`	`325`	`}`
`325`	`326`	`finally`
`326`	`327`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using WindowsInput;`
`9`	`9`	`using WindowsInput.Native;`
`10`	`10`	`using Flow.Launcher.Infrastructure.Hotkey;`
`11`		`-using Flow.Launcher.Infrastructure.Logger;`
`12`	`11`	`using Flow.Launcher.Plugin.SharedCommands;`
`13`	`12`	`using Control = System.Windows.Controls.Control;`
`14`	`13`	`using Keys = System.Windows.Forms.Keys;`
`@@ -17,8 +16,11 @@ namespace Flow.Launcher.Plugin.Shell`
`17`	`16`	`{`
`18`	`17`	`public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu`
`19`	`18`	`{`
	`19`	`+ private static readonly string ClassName = nameof(Main);`
	`20`	`+`
	`21`	`+ internal PluginInitContext Context { get; private set; }`
	`22`	`+`
`20`	`23`	`private const string Image = "Images/shell.png";`
`21`		`- private PluginInitContext context;`
`22`	`24`	`private bool _winRStroked;`
`23`	`25`	`private readonly KeyboardSimulator _keyboardSimulator = new KeyboardSimulator(new InputSimulator());`
`24`	`26`
`@@ -88,7 +90,7 @@ public List<Result> Query(Query query)`
`88`	`90`	`}`
`89`	`91`	`catch (Exception e)`
`90`	`92`	`{`
`91`		`- Log.Exception($"\|Flow.Launcher.Plugin.Shell.Main.Query\|Exception when query for <{query}>", e);`
	`93`	`+ Context.API.LogException(ClassName, $"Exception when query for <{query}>", e);`
`92`	`94`	`}`
`93`	`95`	`return results;`
`94`	`96`	`}`
`@@ -102,14 +104,14 @@ private List<Result> GetHistoryCmds(string cmd, Result result)`
`102`	`104`	`{`
`103`	`105`	`if (m.Key == cmd)`
`104`	`106`	`{`
`105`		`- result.SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value);`
	`107`	`+ result.SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value);`
`106`	`108`	`return null;`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`var ret = new Result`
`110`	`112`	`{`
`111`	`113`	`Title = m.Key,`
`112`		`- SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),`
	`114`	`+ SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),`
`113`	`115`	`IcoPath = Image,`
`114`	`116`	`Action = c =>`
`115`	`117`	`{`
`@@ -139,7 +141,7 @@ private Result GetCurrentCmd(string cmd)`
`139`	`141`	`{`
`140`	`142`	`Title = cmd,`
`141`	`143`	`Score = 5000,`
`142`		`- SubTitle = context.API.GetTranslation("flowlauncher_plugin_cmd_execute_through_shell"),`
	`144`	`+ SubTitle = Context.API.GetTranslation("flowlauncher_plugin_cmd_execute_through_shell"),`
`143`	`145`	`IcoPath = Image,`
`144`	`146`	`Action = c =>`
`145`	`147`	`{`
`@@ -164,7 +166,7 @@ private List<Result> ResultsFromHistory()`
`164`	`166`	`.Select(m => new Result`
`165`	`167`	`{`
`166`	`168`	`Title = m.Key,`
`167`		`- SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),`
	`169`	`+ SubTitle = string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_cmd_has_been_executed_times"), m.Value),`
`168`	`170`	`IcoPath = Image,`
`169`	`171`	`Action = c =>`
`170`	`172`	`{`
`@@ -211,7 +213,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin`
`211`	`213`	`info.FileName = "cmd.exe";`
`212`	`214`	`}`
`213`	`215`
`214`		`- info.ArgumentList.Add($"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command} {(_settings.CloseShellAfterPress ? $"&& echo {context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")} && pause > nul /c" : "")}");`
	`216`	`+ info.ArgumentList.Add($"{(_settings.LeaveShellOpen ? "/k" : "/c")} {command} {(_settings.CloseShellAfterPress ? $"&& echo {Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")} && pause > nul /c" : "")}");`
`215`	`217`	`break;`
`216`	`218`	`}`
`217`	`219`
`@@ -234,7 +236,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin`
`234`	`236`	`else`
`235`	`237`	`{`
`236`	`238`	`info.ArgumentList.Add("-Command");`
`237`		`- info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");`
	`239`	`+ info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");`
`238`	`240`	`}`
`239`	`241`	`break;`
`240`	`242`	`}`
`@@ -255,7 +257,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin`
`255`	`257`	`info.ArgumentList.Add("-NoExit");`
`256`	`258`	`}`
`257`	`259`	`info.ArgumentList.Add("-Command");`
`258`		`- info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");`
	`260`	`+ info.ArgumentList.Add($"{command}\\; {(_settings.CloseShellAfterPress ? $"Write-Host '{Context.API.GetTranslation("flowlauncher_plugin_cmd_press_any_key_to_close")}'\\; [System.Console]::ReadKey()\\; exit" : "")}");`
`259`	`261`	`break;`
`260`	`262`	`}`
`261`	`263`
`@@ -309,13 +311,13 @@ private void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartI`
`309`	`311`	`{`
`310`	`312`	`var name = "Plugin: Shell";`
`311`	`313`	`var message = $"Command not found: {e.Message}";`
`312`		`- context.API.ShowMsg(name, message);`
	`314`	`+ Context.API.ShowMsg(name, message);`
`313`	`315`	`}`
`314`	`316`	`catch (Win32Exception e)`
`315`	`317`	`{`
`316`	`318`	`var name = "Plugin: Shell";`
`317`	`319`	`var message = $"Error running the command: {e.Message}";`
`318`		`- context.API.ShowMsg(name, message);`
	`320`	`+ Context.API.ShowMsg(name, message);`
`319`	`321`	`}`
`320`	`322`	`}`
`321`	`323`
`@@ -350,14 +352,14 @@ private bool ExistInPath(string filename)`
`350`	`352`
`351`	`353`	`public void Init(PluginInitContext context)`
`352`	`354`	`{`
`353`		`- this.context = context;`
	`355`	`+ Context = context;`
`354`	`356`	`_settings = context.API.LoadSettingJsonStorage<Settings>();`
`355`	`357`	`context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);`
`356`	`358`	`}`
`357`	`359`
`358`	`360`	`bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)`
`359`	`361`	`{`
`360`		`- if (!context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)`
	`362`	`+ if (!Context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)`
`361`	`363`	`{`
`362`	`364`	`if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)`
`363`	`365`	`{`
`@@ -380,10 +382,9 @@ private void OnWinRPressed()`
`380`	`382`	`// show the main window and set focus to the query box`
`381`	`383`	`_ = Task.Run(() =>`
`382`	`384`	`{`
`383`		`- context.API.ShowMainWindow();`
`384`		`- context.API.ChangeQuery($"{context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");`
	`385`	`+ Context.API.ShowMainWindow();`
	`386`	`+ Context.API.ChangeQuery($"{Context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");`
`385`	`387`	`});`
`386`		`-`
`387`	`388`	`}`
`388`	`389`
`389`	`390`	`public Control CreateSettingPanel()`
`@@ -393,12 +394,12 @@ public Control CreateSettingPanel()`
`393`	`394`
`394`	`395`	`public string GetTranslatedPluginTitle()`
`395`	`396`	`{`
`396`		`- return context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_name");`
	`397`	`+ return Context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_name");`
`397`	`398`	`}`
`398`	`399`
`399`	`400`	`public string GetTranslatedPluginDescription()`
`400`	`401`	`{`
`401`		`- return context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_description");`
	`402`	`+ return Context.API.GetTranslation("flowlauncher_plugin_cmd_plugin_description");`
`402`	`403`	`}`
`403`	`404`
`404`	`405`	`public List<Result> LoadContextMenus(Result selectedResult)`
`@@ -407,8 +408,8 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`407`	`408`	`{`
`408`	`409`	`new()`
`409`	`410`	`{`
`410`		`- Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"),`
`411`		`- AsyncAction = async c =>`
	`411`	`+ Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_different_user"),`
	`412`	`+ Action = c =>`
`412`	`413`	`{`
`413`	`414`	`Execute(ShellCommand.RunAsDifferentUser, PrepareProcessStartInfo(selectedResult.Title));`
`414`	`415`	`return true;`
`@@ -418,7 +419,7 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`418`	`419`	`},`
`419`	`420`	`new()`
`420`	`421`	`{`
`421`		`- Title = context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_administrator"),`
	`422`	`+ Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_run_as_administrator"),`
`422`	`423`	`Action = c =>`
`423`	`424`	`{`
`424`	`425`	`Execute(Process.Start, PrepareProcessStartInfo(selectedResult.Title, true));`
`@@ -429,10 +430,10 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`429`	`430`	`},`
`430`	`431`	`new()`
`431`	`432`	`{`
`432`		`- Title = context.API.GetTranslation("flowlauncher_plugin_cmd_copy"),`
	`433`	`+ Title = Context.API.GetTranslation("flowlauncher_plugin_cmd_copy"),`
`433`	`434`	`Action = c =>`
`434`	`435`	`{`
`435`		`- context.API.CopyToClipboard(selectedResult.Title);`
	`436`	`+ Context.API.CopyToClipboard(selectedResult.Title);`
`436`	`437`	`return true;`
`437`	`438`	`},`
`438`	`439`	`IcoPath = "Images/copy.png",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`	`7`	`using System.Windows;`
`8`	`8`	`using Flow.Launcher.Infrastructure;`
`9`		`-using Flow.Launcher.Infrastructure.Logger;`
`10`	`9`	`using Flow.Launcher.Infrastructure.UserSettings;`
`11`	`10`	`using Windows.Win32;`
`12`	`11`	`using Windows.Win32.Foundation;`
`@@ -19,6 +18,8 @@ namespace Flow.Launcher.Plugin.Sys`
`19`	`18`	`{`
`20`	`19`	`public class Main : IPlugin, ISettingProvider, IPluginI18n`
`21`	`20`	`{`
	`21`	`+ private static readonly string ClassName = nameof(Main);`
	`22`	`+`
`22`	`23`	`private readonly Dictionary<string, string> KeywordTitleMappings = new()`
`23`	`24`	`{`
`24`	`25`	`{"Shutdown", "flowlauncher_plugin_sys_shutdown_computer_cmd"},`
`@@ -106,7 +107,7 @@ private string GetTitle(string key)`
`106`	`107`	`{`
`107`	`108`	`if (!KeywordTitleMappings.TryGetValue(key, out var translationKey))`
`108`	`109`	`{`
`109`		`- Log.Error("Flow.Launcher.Plugin.Sys.Main", $"Title not found for: {key}");`
	`110`	`+ _context.API.LogError(ClassName, $"Title not found for: {key}");`
`110`	`111`	`return "Title Not Found";`
`111`	`112`	`}`
`112`	`113`
`@@ -117,7 +118,7 @@ private string GetDescription(string key)`
`117`	`118`	`{`
`118`	`119`	`if (!KeywordDescriptionMappings.TryGetValue(key, out var translationKey))`
`119`	`120`	`{`
`120`		`- Log.Error("Flow.Launcher.Plugin.Sys.Main", $"Description not found for: {key}");`
	`121`	`+ _context.API.LogError(ClassName, $"Description not found for: {key}");`
`121`	`122`	`return "Description Not Found";`
`122`	`123`	`}`
`123`	`124`