Improve code quality

Jack251970 · Jack251970 · commit 826bc4253643 · 2025-04-09T12:44:26.000+08:00
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -275,7 +275,7 @@ static void MoveFile(string sourcePath, string destinationPath)
             static void WatchProgramUpdate()
             {
                 Win32.WatchProgramUpdate(_settings);
-                _ = UWPPackage.WatchPackageChange();
+                _ = UWPPackage.WatchPackageChangeAsync();
             }
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -8,7 +8,6 @@
 using System.Windows.Media.Imaging;
 using Windows.ApplicationModel;
 using Windows.Management.Deployment;
-using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin.Program.Logger;
 using Flow.Launcher.Plugin.SharedModels;
 using System.Threading.Channels;
@@ -290,9 +289,9 @@ private static IEnumerable<Package> CurrentUserPackages()
             }
         }
 
-        private static Channel<byte> PackageChangeChannel = Channel.CreateBounded<byte>(1);
+        private static readonly Channel<byte> PackageChangeChannel = Channel.CreateBounded<byte>(1);
 
-        public static async Task WatchPackageChange()
+        public static async Task WatchPackageChangeAsync()
         {
             if (Environment.OSVersion.Version.Major >= 10)
             {
@@ -403,13 +402,13 @@ public Result Result(string query, IPublicAPI api)
             if (!Main._settings.EnableDescription || string.IsNullOrWhiteSpace(Description) || Name.Equals(Description))
             {
                 title = Name;
-                matchResult = StringMatcher.FuzzySearch(query, Name);
+                matchResult = Main.Context.API.FuzzySearch(query, Name);
             }
             else
             {
                 title = $"{Name}: {Description}";
-                var nameMatch = StringMatcher.FuzzySearch(query, Name);
-                var descriptionMatch = StringMatcher.FuzzySearch(query, Description);
+                var nameMatch = Main.Context.API.FuzzySearch(query, Name);
+                var descriptionMatch = Main.Context.API.FuzzySearch(query, Description);
                 if (descriptionMatch.Score > nameMatch.Score)
                 {
                     for (int i = 0; i < descriptionMatch.MatchData.Count; i++)
@@ -477,7 +476,7 @@ public List<Result> ContextMenus(IPublicAPI api)
         {
             var contextMenus = new List<Result>
             {
-                new Result
+                new()
                 {
                     Title = api.GetTranslation("flowlauncher_plugin_program_open_containing_folder"),
                     Action = _ =>
@@ -496,9 +495,9 @@ public List<Result> ContextMenus(IPublicAPI api)
                 contextMenus.Add(new Result
                 {
                     Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),
-                    Action = _ =>
+                    Action = c =>
                     {
-                        Task.Run(() => Launch(true)).ConfigureAwait(false);
+                        _ = Task.Run(() => Launch(true)).ConfigureAwait(false);
                         return true;
                     },
                     IcoPath = "Images/cmd.png",
@@ -539,7 +538,7 @@ internal string LogoPathFromUri(string uri, (int, int) desiredSize)
             {
                 ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Location}" +
                                            $"|{UserModelId} 's logo uri is null or empty: {Location}",
-                    new ArgumentException("uri"));
+                    new ArgumentException(null, nameof(uri)));
                 return string.Empty;
             }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Win32;
-using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin.Program.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Plugin.SharedModels;
@@ -73,7 +72,7 @@ public string UniqueIdentifier
         private const string ExeExtension = "exe";
         private string _uid = string.Empty;
 
-        private static readonly Win32 Default = new Win32()
+        private static readonly Win32 Default = new()
         {
             Name = string.Empty,
             Description = string.Empty,
@@ -92,7 +91,7 @@ private static MatchResult Match(string query, IReadOnlyCollection<string> candi
             if (candidates.Count == 0)
                 return null;
 
-            var match = candidates.Select(candidate => StringMatcher.FuzzySearch(query, candidate))
+            var match = candidates.Select(candidate => Main.Context.API.FuzzySearch(query, candidate))
                 .MaxBy(match => match.Score);
 
             return match?.IsSearchPrecisionScoreMet() ?? false ? match : null;
@@ -112,14 +111,14 @@ public Result Result(string query, IPublicAPI api)
                 resultName.Equals(Description))
             {
                 title = resultName;
-                matchResult = StringMatcher.FuzzySearch(query, resultName);
+                matchResult = Main.Context.API.FuzzySearch(query, resultName);
             }
             else
             {
                 // Search in both
                 title = $"{resultName}: {Description}";
-                var nameMatch = StringMatcher.FuzzySearch(query, resultName);
-                var descriptionMatch = StringMatcher.FuzzySearch(query, Description);
+                var nameMatch = Main.Context.API.FuzzySearch(query, resultName);
+                var descriptionMatch = Main.Context.API.FuzzySearch(query, Description);
                 if (descriptionMatch.Score > nameMatch.Score)
                 {
                     for (int i = 0; i < descriptionMatch.MatchData.Count; i++)
@@ -219,27 +218,27 @@ public List<Result> ContextMenus(IPublicAPI api)
         {
             var contextMenus = new List<Result>
             {
-                new Result
+                new()
                 {
                     Title = api.GetTranslation("flowlauncher_plugin_program_run_as_different_user"),
-                    Action = _ =>
+                    Action = c =>
                     {
                         var info = new ProcessStartInfo
                         {
                             FileName = FullPath, WorkingDirectory = ParentDirectory, UseShellExecute = true
                         };
 
-                        Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));
+                        _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));
 
                         return true;
                     },
                     IcoPath = "Images/user.png",
                     Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ee"),
                 },
-                new Result
+                new()
                 {
                     Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),
-                    Action = _ =>
+                    Action = c =>
                     {
                         var info = new ProcessStartInfo
                         {
@@ -249,14 +248,14 @@ public List<Result> ContextMenus(IPublicAPI api)
                             UseShellExecute = true
                         };
 
-                        Task.Run(() => Main.StartProcess(Process.Start, info));
+                        _ = Task.Run(() => Main.StartProcess(Process.Start, info));
 
                         return true;
                     },
                     IcoPath = "Images/cmd.png",
                     Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ef"),
                 },
-                new Result
+                new()
                 {
                     Title = api.GetTranslation("flowlauncher_plugin_program_open_containing_folder"),
                     Action = _ =>
@@ -296,7 +295,7 @@ public override string ToString()
             return Name;
         }
 
-        private static List<FileSystemWatcher> Watchers = new List<FileSystemWatcher>();
+        private static readonly List<FileSystemWatcher> Watchers = new();
 
         private static Win32 Win32Program(string path)
         {
@@ -402,7 +401,7 @@ private static Win32 UrlProgram(string path, string[] protocols)
                 var data = parser.ReadFile(path);
                 var urlSection = data["InternetShortcut"];
                 var url = urlSection?["URL"];
-                if (String.IsNullOrEmpty(url))
+                if (string.IsNullOrEmpty(url))
                 {
                     return program;
                 }
@@ -418,12 +417,12 @@ private static Win32 UrlProgram(string path, string[] protocols)
                 }
 
                 var iconPath = urlSection?["IconFile"];
-                if (!String.IsNullOrEmpty(iconPath))
+                if (!string.IsNullOrEmpty(iconPath))
                 {
                     program.IcoPath = iconPath;
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 // Many files do not have the required fields, so no logging is done.
             }
@@ -474,7 +473,7 @@ private static string Extension(string path)
             var extension = Path.GetExtension(path)?.ToLowerInvariant();
             if (!string.IsNullOrEmpty(extension))
             {
-                return extension.Substring(1); // remove dot
+                return extension[1..]; // remove dot
             }
             else
             {
@@ -785,7 +784,7 @@ public static void WatchProgramUpdate(Settings settings)
             _ = Task.Run(MonitorDirectoryChangeAsync);
         }
 
-        private static Channel<byte> indexQueue = Channel.CreateBounded<byte>(1);
+        private static readonly Channel<byte> indexQueue = Channel.CreateBounded<byte>(1);
 
         public static async Task MonitorDirectoryChangeAsync()
         {

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static void MoveFile(string sourcePath, string destinationPath)`
`275`	`275`	`static void WatchProgramUpdate()`
`276`	`276`	`{`
`277`	`277`	`Win32.WatchProgramUpdate(_settings);`
`278`		`- _ = UWPPackage.WatchPackageChange();`
	`278`	`+ _ = UWPPackage.WatchPackageChangeAsync();`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Windows.Media.Imaging;`
`9`	`9`	`using Windows.ApplicationModel;`
`10`	`10`	`using Windows.Management.Deployment;`
`11`		`-using Flow.Launcher.Infrastructure;`
`12`	`11`	`using Flow.Launcher.Plugin.Program.Logger;`
`13`	`12`	`using Flow.Launcher.Plugin.SharedModels;`
`14`	`13`	`using System.Threading.Channels;`
`@@ -290,9 +289,9 @@ private static IEnumerable<Package> CurrentUserPackages()`
`290`	`289`	`}`
`291`	`290`	`}`
`292`	`291`
`293`		`- private static Channel<byte> PackageChangeChannel = Channel.CreateBounded<byte>(1);`
	`292`	`+ private static readonly Channel<byte> PackageChangeChannel = Channel.CreateBounded<byte>(1);`
`294`	`293`
`295`		`- public static async Task WatchPackageChange()`
	`294`	`+ public static async Task WatchPackageChangeAsync()`
`296`	`295`	`{`
`297`	`296`	`if (Environment.OSVersion.Version.Major >= 10)`
`298`	`297`	`{`
`@@ -403,13 +402,13 @@ public Result Result(string query, IPublicAPI api)`
`403`	`402`	`if (!Main._settings.EnableDescription \|\| string.IsNullOrWhiteSpace(Description) \|\| Name.Equals(Description))`
`404`	`403`	`{`
`405`	`404`	`title = Name;`
`406`		`- matchResult = StringMatcher.FuzzySearch(query, Name);`
	`405`	`+ matchResult = Main.Context.API.FuzzySearch(query, Name);`
`407`	`406`	`}`
`408`	`407`	`else`
`409`	`408`	`{`
`410`	`409`	`title = $"{Name}: {Description}";`
`411`		`- var nameMatch = StringMatcher.FuzzySearch(query, Name);`
`412`		`- var descriptionMatch = StringMatcher.FuzzySearch(query, Description);`
	`410`	`+ var nameMatch = Main.Context.API.FuzzySearch(query, Name);`
	`411`	`+ var descriptionMatch = Main.Context.API.FuzzySearch(query, Description);`
`413`	`412`	`if (descriptionMatch.Score > nameMatch.Score)`
`414`	`413`	`{`
`415`	`414`	`for (int i = 0; i < descriptionMatch.MatchData.Count; i++)`
`@@ -477,7 +476,7 @@ public List<Result> ContextMenus(IPublicAPI api)`
`477`	`476`	`{`
`478`	`477`	`var contextMenus = new List<Result>`
`479`	`478`	`{`
`480`		`- new Result`
	`479`	`+ new()`
`481`	`480`	`{`
`482`	`481`	`Title = api.GetTranslation("flowlauncher_plugin_program_open_containing_folder"),`
`483`	`482`	`Action = _ =>`
`@@ -496,9 +495,9 @@ public List<Result> ContextMenus(IPublicAPI api)`
`496`	`495`	`contextMenus.Add(new Result`
`497`	`496`	`{`
`498`	`497`	`Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),`
`499`		`- Action = _ =>`
	`498`	`+ Action = c =>`
`500`	`499`	`{`
`501`		`- Task.Run(() => Launch(true)).ConfigureAwait(false);`
	`500`	`+ _ = Task.Run(() => Launch(true)).ConfigureAwait(false);`
`502`	`501`	`return true;`
`503`	`502`	`},`
`504`	`503`	`IcoPath = "Images/cmd.png",`
`@@ -539,7 +538,7 @@ internal string LogoPathFromUri(string uri, (int, int) desiredSize)`
`539`	`538`	`{`
`540`	`539`	`ProgramLogger.LogException($"\|UWP\|LogoPathFromUri\|{Location}" +`
`541`	`540`	`$"\|{UserModelId} 's logo uri is null or empty: {Location}",`
`542`		`- new ArgumentException("uri"));`
	`541`	`+ new ArgumentException(null, nameof(uri)));`
`543`	`542`	`return string.Empty;`
`544`	`543`	`}`
`545`	`544`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Text;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using Microsoft.Win32;`
`9`		`-using Flow.Launcher.Infrastructure;`
`10`	`9`	`using Flow.Launcher.Plugin.Program.Logger;`
`11`	`10`	`using Flow.Launcher.Plugin.SharedCommands;`
`12`	`11`	`using Flow.Launcher.Plugin.SharedModels;`
`@@ -73,7 +72,7 @@ public string UniqueIdentifier`
`73`	`72`	`private const string ExeExtension = "exe";`
`74`	`73`	`private string _uid = string.Empty;`
`75`	`74`
`76`		`- private static readonly Win32 Default = new Win32()`
	`75`	`+ private static readonly Win32 Default = new()`
`77`	`76`	`{`
`78`	`77`	`Name = string.Empty,`
`79`	`78`	`Description = string.Empty,`
`@@ -92,7 +91,7 @@ private static MatchResult Match(string query, IReadOnlyCollection<string> candi`
`92`	`91`	`if (candidates.Count == 0)`
`93`	`92`	`return null;`
`94`	`93`
`95`		`- var match = candidates.Select(candidate => StringMatcher.FuzzySearch(query, candidate))`
	`94`	`+ var match = candidates.Select(candidate => Main.Context.API.FuzzySearch(query, candidate))`
`96`	`95`	`.MaxBy(match => match.Score);`
`97`	`96`
`98`	`97`	`return match?.IsSearchPrecisionScoreMet() ?? false ? match : null;`
`@@ -112,14 +111,14 @@ public Result Result(string query, IPublicAPI api)`
`112`	`111`	`resultName.Equals(Description))`
`113`	`112`	`{`
`114`	`113`	`title = resultName;`
`115`		`- matchResult = StringMatcher.FuzzySearch(query, resultName);`
	`114`	`+ matchResult = Main.Context.API.FuzzySearch(query, resultName);`
`116`	`115`	`}`
`117`	`116`	`else`
`118`	`117`	`{`
`119`	`118`	`// Search in both`
`120`	`119`	`title = $"{resultName}: {Description}";`
`121`		`- var nameMatch = StringMatcher.FuzzySearch(query, resultName);`
`122`		`- var descriptionMatch = StringMatcher.FuzzySearch(query, Description);`
	`120`	`+ var nameMatch = Main.Context.API.FuzzySearch(query, resultName);`
	`121`	`+ var descriptionMatch = Main.Context.API.FuzzySearch(query, Description);`
`123`	`122`	`if (descriptionMatch.Score > nameMatch.Score)`
`124`	`123`	`{`
`125`	`124`	`for (int i = 0; i < descriptionMatch.MatchData.Count; i++)`
`@@ -219,27 +218,27 @@ public List<Result> ContextMenus(IPublicAPI api)`
`219`	`218`	`{`
`220`	`219`	`var contextMenus = new List<Result>`
`221`	`220`	`{`
`222`		`- new Result`
	`221`	`+ new()`
`223`	`222`	`{`
`224`	`223`	`Title = api.GetTranslation("flowlauncher_plugin_program_run_as_different_user"),`
`225`		`- Action = _ =>`
	`224`	`+ Action = c =>`
`226`	`225`	`{`
`227`	`226`	`var info = new ProcessStartInfo`
`228`	`227`	`{`
`229`	`228`	`FileName = FullPath, WorkingDirectory = ParentDirectory, UseShellExecute = true`
`230`	`229`	`};`
`231`	`230`
`232`		`- Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));`
	`231`	`+ _ = Task.Run(() => Main.StartProcess(ShellCommand.RunAsDifferentUser, info));`
`233`	`232`
`234`	`233`	`return true;`
`235`	`234`	`},`
`236`	`235`	`IcoPath = "Images/user.png",`
`237`	`236`	`Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ee"),`
`238`	`237`	`},`
`239`		`- new Result`
	`238`	`+ new()`
`240`	`239`	`{`
`241`	`240`	`Title = api.GetTranslation("flowlauncher_plugin_program_run_as_administrator"),`
`242`		`- Action = _ =>`
	`241`	`+ Action = c =>`
`243`	`242`	`{`
`244`	`243`	`var info = new ProcessStartInfo`
`245`	`244`	`{`
`@@ -249,14 +248,14 @@ public List<Result> ContextMenus(IPublicAPI api)`
`249`	`248`	`UseShellExecute = true`
`250`	`249`	`};`
`251`	`250`
`252`		`- Task.Run(() => Main.StartProcess(Process.Start, info));`
	`251`	`+ _ = Task.Run(() => Main.StartProcess(Process.Start, info));`
`253`	`252`
`254`	`253`	`return true;`
`255`	`254`	`},`
`256`	`255`	`IcoPath = "Images/cmd.png",`
`257`	`256`	`Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ef"),`
`258`	`257`	`},`
`259`		`- new Result`
	`258`	`+ new()`
`260`	`259`	`{`
`261`	`260`	`Title = api.GetTranslation("flowlauncher_plugin_program_open_containing_folder"),`
`262`	`261`	`Action = _ =>`
`@@ -296,7 +295,7 @@ public override string ToString()`
`296`	`295`	`return Name;`
`297`	`296`	`}`
`298`	`297`
`299`		`- private static List<FileSystemWatcher> Watchers = new List<FileSystemWatcher>();`
	`298`	`+ private static readonly List<FileSystemWatcher> Watchers = new();`
`300`	`299`
`301`	`300`	`private static Win32 Win32Program(string path)`
`302`	`301`	`{`
`@@ -402,7 +401,7 @@ private static Win32 UrlProgram(string path, string[] protocols)`
`402`	`401`	`var data = parser.ReadFile(path);`
`403`	`402`	`var urlSection = data["InternetShortcut"];`
`404`	`403`	`var url = urlSection?["URL"];`
`405`		`- if (String.IsNullOrEmpty(url))`
	`404`	`+ if (string.IsNullOrEmpty(url))`
`406`	`405`	`{`
`407`	`406`	`return program;`
`408`	`407`	`}`
`@@ -418,12 +417,12 @@ private static Win32 UrlProgram(string path, string[] protocols)`
`418`	`417`	`}`
`419`	`418`
`420`	`419`	`var iconPath = urlSection?["IconFile"];`
`421`		`- if (!String.IsNullOrEmpty(iconPath))`
	`420`	`+ if (!string.IsNullOrEmpty(iconPath))`
`422`	`421`	`{`
`423`	`422`	`program.IcoPath = iconPath;`
`424`	`423`	`}`
`425`	`424`	`}`
`426`		`- catch (Exception e)`
	`425`	`+ catch (Exception)`
`427`	`426`	`{`
`428`	`427`	`// Many files do not have the required fields, so no logging is done.`
`429`	`428`	`}`
`@@ -474,7 +473,7 @@ private static string Extension(string path)`
`474`	`473`	`var extension = Path.GetExtension(path)?.ToLowerInvariant();`
`475`	`474`	`if (!string.IsNullOrEmpty(extension))`
`476`	`475`	`{`
`477`		`- return extension.Substring(1); // remove dot`
	`476`	`+ return extension[1..]; // remove dot`
`478`	`477`	`}`
`479`	`478`	`else`
`480`	`479`	`{`
`@@ -785,7 +784,7 @@ public static void WatchProgramUpdate(Settings settings)`
`785`	`784`	`_ = Task.Run(MonitorDirectoryChangeAsync);`
`786`	`785`	`}`
`787`	`786`
`788`		`- private static Channel<byte> indexQueue = Channel.CreateBounded<byte>(1);`
	`787`	`+ private static readonly Channel<byte> indexQueue = Channel.CreateBounded<byte>(1);`
`789`	`788`
`790`	`789`	`public static async Task MonitorDirectoryChangeAsync()`
`791`	`790`	`{`