Use class name instead

Jack251970 · Jack251970 · commit 50130e4b009a · 2025-04-13T17:59:39.000+08:00
diff --git a/Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs b/Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs
@@ -9,6 +9,8 @@ namespace Flow.Launcher.Core.ExternalPlugins
 {
     public static class PluginsManifest
     {
+        private static readonly string ClassName = nameof(PluginsManifest);
+
         private static readonly CommunityPluginStore mainPluginStore =
             new("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json",
                 "https://fastly.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json",
@@ -44,7 +46,7 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
             }
             catch (Exception e)
             {
-                Ioc.Default.GetRequiredService<IPublicAPI>().LogException(nameof(PluginsManifest), "Http request failed", e);
+                Ioc.Default.GetRequiredService<IPublicAPI>().LogException(ClassName, "Http request failed", e);
             }
             finally
             {
diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -12,6 +12,8 @@ namespace Flow.Launcher.Helper;
 
 public static class WallpaperPathRetrieval
 {
+    private static readonly string ClassName = nameof(WallpaperPathRetrieval);
+
     private const int MaxCacheSize = 3;
     private static readonly Dictionary<(string, DateTime), ImageBrush> WallpaperCache = new();
     private static readonly object CacheLock = new();
@@ -29,7 +31,7 @@ public static Brush GetWallpaperBrush()
             var wallpaperPath = Win32Helper.GetWallpaperPath();
             if (string.IsNullOrEmpty(wallpaperPath) || !File.Exists(wallpaperPath))
             {
-                App.API.LogInfo(nameof(WallpaperPathRetrieval), $"Wallpaper path is invalid: {wallpaperPath}");
+                App.API.LogInfo(ClassName, $"Wallpaper path is invalid: {wallpaperPath}");
                 var wallpaperColor = GetWallpaperColor();
                 return new SolidColorBrush(wallpaperColor);
             }
@@ -54,7 +56,7 @@ public static Brush GetWallpaperBrush()
 
             if (originalWidth == 0 || originalHeight == 0)
             {
-                App.API.LogInfo(nameof(WallpaperPathRetrieval), $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");
+                App.API.LogInfo(ClassName, $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");
                 return new SolidColorBrush(Colors.Transparent);
             }
 
@@ -95,7 +97,7 @@ public static Brush GetWallpaperBrush()
         }
         catch (Exception ex)
         {
-            App.API.LogException(nameof(WallpaperPathRetrieval), "Error retrieving wallpaper", ex);
+            App.API.LogException(ClassName, "Error retrieving wallpaper", ex);
             return new SolidColorBrush(Colors.Transparent);
         }
     }
@@ -113,7 +115,7 @@ private static Color GetWallpaperColor()
             }
             catch (Exception ex)
             {
-                App.API.LogException(nameof(WallpaperPathRetrieval), "Error parsing wallpaper color", ex);
+                App.API.LogException(ClassName, "Error parsing wallpaper color", ex);
             }
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -15,6 +15,8 @@ namespace Flow.Launcher.Plugin.BrowserBookmark;
 
 public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, IDisposable
 {
+    private static readonly string ClassName = nameof(Main);
+
     internal static string _faviconCacheDir;
 
     internal static PluginInitContext _context;
@@ -221,7 +223,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
                     catch (Exception e)
                     {
                         var message = "Failed to set url in clipboard";
-                        _context.API.LogException(nameof(Main), message, e);
+                        _context.API.LogException(ClassName, message, e);
 
                         _context.API.ShowMsg(message);
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -15,6 +15,8 @@ namespace Flow.Launcher.Plugin.Explorer
 {
     internal class ContextMenu : IContextMenu
     {
+        private static readonly string ClassName = nameof(ContextMenu);
+
         private PluginInitContext Context { get; set; }
 
         private Settings Settings { get; set; }
@@ -469,7 +471,7 @@ private Result CreateOpenWithMenu(SearchResult record)
 
         private void LogException(string message, Exception e)
         {
-            Context.API.LogException(nameof(ContextMenu), message, e);
+            Context.API.LogException(ClassName, message, e);
         }
 
         private static bool CanRunAsDifferentUser(string path)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
@@ -9,6 +9,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
 {
     public static class DirectoryInfoSearch
     {
+        private static readonly string ClassName = nameof(DirectoryInfoSearch);
+
         internal static IEnumerable<SearchResult> TopLevelDirectorySearch(Query query, string search, CancellationToken token)
         {
             var criteria = ConstructSearchCriteria(search);
@@ -75,7 +77,7 @@ private static IEnumerable<SearchResult> DirectorySearch(EnumerationOptions enum
             }
             catch (Exception e)
             {
-                Main.Context.API.LogException(nameof(DirectoryInfoSearch), "Error occurred while searching path", e);
+                Main.Context.API.LogException(ClassName, "Error occurred while searching path", e);
                 
                 throw;
             }
diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs b/Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs
@@ -12,6 +12,8 @@ namespace Flow.Launcher.Plugin.ProcessKiller
 {
     internal class ProcessHelper
     {
+        private static readonly string ClassName = nameof(ProcessHelper);
+
         private readonly HashSet<string> _systemProcessList = new()
         {
             "conhost",
@@ -131,7 +133,7 @@ public void TryKill(PluginInitContext context, Process p)
             }
             catch (Exception e)
             {
-                context.API.LogException($"{nameof(ProcessHelper)}", $"Failed to kill process {p.ProcessName}", e);
+                context.API.LogException(ClassName, $"Failed to kill process {p.ProcessName}", e);
             }
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs
@@ -11,6 +11,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
 {
     public class Baidu : SuggestionSource
     {
+        private static readonly string ClassName = nameof(Baidu);
+
         private readonly Regex _reg = new Regex("window.baidu.sug\\((.*)\\)");
 
         public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)
@@ -24,7 +26,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Main._context.API.LogException(nameof(Baidu), "Can't get suggestion from Baidu", e);
+                Main._context.API.LogException(ClassName, "Can't get suggestion from Baidu", e);
                 return null;
             }
 
@@ -39,7 +41,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
                 }
                 catch (JsonException e)
                 {
-                    Main._context.API.LogException(nameof(Baidu), "Can't parse suggestions", e);
+                    Main._context.API.LogException(ClassName, "Can't parse suggestions", e);
                     return new List<string>();
                 }
 
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
@@ -10,6 +10,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
 {
     public class Bing : SuggestionSource
     {
+        private static readonly string ClassName = nameof(Bing);
+
         public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)
         {
             try
@@ -33,12 +35,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or { InnerException: TimeoutException })
             {
-                Main._context.API.LogException(nameof(Bing), "Can't get suggestion from Bing", e);
+                Main._context.API.LogException(ClassName, "Can't get suggestion from Bing", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Main._context.API.LogException(nameof(Bing), "Can't parse suggestions", e);
+                Main._context.API.LogException(ClassName, "Can't parse suggestions", e);
                 return new List<string>();
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/DuckDuckGo.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/DuckDuckGo.cs
@@ -10,6 +10,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
 {
     public class DuckDuckGo : SuggestionSource
     {
+        private static readonly string ClassName = nameof(DuckDuckGo);
+
         public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)
         {
             // When the search query is empty, DuckDuckGo returns `[]`. When it's not empty, it returns data
@@ -34,12 +36,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Main._context.API.LogException(nameof(DuckDuckGo), "Can't get suggestion from DuckDuckGo", e);
+                Main._context.API.LogException(ClassName, "Can't get suggestion from DuckDuckGo", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Main._context.API.LogException(nameof(DuckDuckGo), "Can't parse suggestions", e);
+                Main._context.API.LogException(ClassName, "Can't parse suggestions", e);
                 return new List<string>();
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
@@ -10,6 +10,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
 {
     public class Google : SuggestionSource
     {
+        private static readonly string ClassName = nameof(Google);
+
         public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)
         {
             try
@@ -27,12 +29,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Main._context.API.LogException(nameof(Google), "Can't get suggestion from Google", e);
+                Main._context.API.LogException(ClassName, "Can't get suggestion from Google", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Main._context.API.LogException(nameof(Google), "Can't parse suggestions", e);
+                Main._context.API.LogException(ClassName, "Can't parse suggestions", e);
                 return new List<string>();
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Log.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Log.cs
@@ -11,10 +11,12 @@ public static void Init(IPublicAPI api)
         {
             _api = api;
         }
+
         public static void Exception(string message, Exception exception, Type type, [CallerMemberName] string methodName = "")
         {
             _api?.LogException(type.FullName, message, exception, methodName);
         }
+
         public static void Warn(string message, Type type, [CallerMemberName] string methodName = "")
         {
             _api?.LogWarn(type.FullName, message, methodName);

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ namespace Flow.Launcher.Core.ExternalPlugins`
`9`	`9`	`{`
`10`	`10`	`public static class PluginsManifest`
`11`	`11`	`{`
	`12`	`+ private static readonly string ClassName = nameof(PluginsManifest);`
	`13`	`+`
`12`	`14`	`private static readonly CommunityPluginStore mainPluginStore =`
`13`	`15`	`new("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json",`
`14`	`16`	`"https://fastly.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest@plugin_api_v2/plugins.json",`
`@@ -44,7 +46,7 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals`
`44`	`46`	`}`
`45`	`47`	`catch (Exception e)`
`46`	`48`	`{`
`47`		`- Ioc.Default.GetRequiredService<IPublicAPI>().LogException(nameof(PluginsManifest), "Http request failed", e);`
	`49`	`+ Ioc.Default.GetRequiredService<IPublicAPI>().LogException(ClassName, "Http request failed", e);`
`48`	`50`	`}`
`49`	`51`	`finally`
`50`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ namespace Flow.Launcher.Helper;`
`12`	`12`
`13`	`13`	`public static class WallpaperPathRetrieval`
`14`	`14`	`{`
	`15`	`+ private static readonly string ClassName = nameof(WallpaperPathRetrieval);`
	`16`	`+`
`15`	`17`	`private const int MaxCacheSize = 3;`
`16`	`18`	`private static readonly Dictionary<(string, DateTime), ImageBrush> WallpaperCache = new();`
`17`	`19`	`private static readonly object CacheLock = new();`
`@@ -29,7 +31,7 @@ public static Brush GetWallpaperBrush()`
`29`	`31`	`var wallpaperPath = Win32Helper.GetWallpaperPath();`
`30`	`32`	`if (string.IsNullOrEmpty(wallpaperPath) \|\| !File.Exists(wallpaperPath))`
`31`	`33`	`{`
`32`		`- App.API.LogInfo(nameof(WallpaperPathRetrieval), $"Wallpaper path is invalid: {wallpaperPath}");`
	`34`	`+ App.API.LogInfo(ClassName, $"Wallpaper path is invalid: {wallpaperPath}");`
`33`	`35`	`var wallpaperColor = GetWallpaperColor();`
`34`	`36`	`return new SolidColorBrush(wallpaperColor);`
`35`	`37`	`}`
`@@ -54,7 +56,7 @@ public static Brush GetWallpaperBrush()`
`54`	`56`
`55`	`57`	`if (originalWidth == 0 \|\| originalHeight == 0)`
`56`	`58`	`{`
`57`		`- App.API.LogInfo(nameof(WallpaperPathRetrieval), $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");`
	`59`	`+ App.API.LogInfo(ClassName, $"Failed to load bitmap: Width={originalWidth}, Height={originalHeight}");`
`58`	`60`	`return new SolidColorBrush(Colors.Transparent);`
`59`	`61`	`}`
`60`	`62`
`@@ -95,7 +97,7 @@ public static Brush GetWallpaperBrush()`
`95`	`97`	`}`
`96`	`98`	`catch (Exception ex)`
`97`	`99`	`{`
`98`		`- App.API.LogException(nameof(WallpaperPathRetrieval), "Error retrieving wallpaper", ex);`
	`100`	`+ App.API.LogException(ClassName, "Error retrieving wallpaper", ex);`
`99`	`101`	`return new SolidColorBrush(Colors.Transparent);`
`100`	`102`	`}`
`101`	`103`	`}`
`@@ -113,7 +115,7 @@ private static Color GetWallpaperColor()`
`113`	`115`	`}`
`114`	`116`	`catch (Exception ex)`
`115`	`117`	`{`
`116`		`- App.API.LogException(nameof(WallpaperPathRetrieval), "Error parsing wallpaper color", ex);`
	`118`	`+ App.API.LogException(ClassName, "Error parsing wallpaper color", ex);`
`117`	`119`	`}`
`118`	`120`	`}`
`119`	`121`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ namespace Flow.Launcher.Plugin.BrowserBookmark;`
`15`	`15`
`16`	`16`	`public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, IDisposable`
`17`	`17`	`{`
	`18`	`+ private static readonly string ClassName = nameof(Main);`
	`19`	`+`
`18`	`20`	`internal static string _faviconCacheDir;`
`19`	`21`
`20`	`22`	`internal static PluginInitContext _context;`
`@@ -221,7 +223,7 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`221`	`223`	`catch (Exception e)`
`222`	`224`	`{`
`223`	`225`	`var message = "Failed to set url in clipboard";`
`224`		`- _context.API.LogException(nameof(Main), message, e);`
	`226`	`+ _context.API.LogException(ClassName, message, e);`
`225`	`227`
`226`	`228`	`_context.API.ShowMsg(message);`
`227`	`229`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources`
`11`	`11`	`{`
`12`	`12`	`public class Baidu : SuggestionSource`
`13`	`13`	`{`
	`14`	`+ private static readonly string ClassName = nameof(Baidu);`
	`15`	`+`
`14`	`16`	`private readonly Regex _reg = new Regex("window.baidu.sug\\((.*)\\)");`
`15`	`17`
`16`	`18`	`public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)`
`@@ -24,7 +26,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`24`	`26`	`}`
`25`	`27`	`catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})`
`26`	`28`	`{`
`27`		`- Main._context.API.LogException(nameof(Baidu), "Can't get suggestion from Baidu", e);`
	`29`	`+ Main._context.API.LogException(ClassName, "Can't get suggestion from Baidu", e);`
`28`	`30`	`return null;`
`29`	`31`	`}`
`30`	`32`
`@@ -39,7 +41,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`39`	`41`	`}`
`40`	`42`	`catch (JsonException e)`
`41`	`43`	`{`
`42`		`- Main._context.API.LogException(nameof(Baidu), "Can't parse suggestions", e);`
	`44`	`+ Main._context.API.LogException(ClassName, "Can't parse suggestions", e);`
`43`	`45`	`return new List<string>();`
`44`	`46`	`}`
`45`	`47`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources`
`10`	`10`	`{`
`11`	`11`	`public class Bing : SuggestionSource`
`12`	`12`	`{`
	`13`	`+ private static readonly string ClassName = nameof(Bing);`
	`14`	`+`
`13`	`15`	`public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)`
`14`	`16`	`{`
`15`	`17`	`try`
`@@ -33,12 +35,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`33`	`35`	`}`
`34`	`36`	`catch (Exception e) when (e is HttpRequestException or { InnerException: TimeoutException })`
`35`	`37`	`{`
`36`		`- Main._context.API.LogException(nameof(Bing), "Can't get suggestion from Bing", e);`
	`38`	`+ Main._context.API.LogException(ClassName, "Can't get suggestion from Bing", e);`
`37`	`39`	`return null;`
`38`	`40`	`}`
`39`	`41`	`catch (JsonException e)`
`40`	`42`	`{`
`41`		`- Main._context.API.LogException(nameof(Bing), "Can't parse suggestions", e);`
	`43`	`+ Main._context.API.LogException(ClassName, "Can't parse suggestions", e);`
`42`	`44`	`return new List<string>();`
`43`	`45`	`}`
`44`	`46`	`}`