prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove useless functions & Fix debug issue

Browse source
This commit is contained in:
Jack251970 2025-04-13 18:13:55 +08:00
parent 20d2661380
commit 43dbf1a0ee
3 changed files with 7 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Flow.Launcher.Core/Plugin/PluginsLoader.cs
View file

@ -89,19 +89,19 @@ namespace Flow.Launcher.Core.Plugin
#else #else
catch (Exception e) when (assembly == null) catch (Exception e) when (assembly == null)
{ {
Log.Exception($"|PluginsLoader.DotNetPlugins|Couldn't load assembly for the plugin: {metadata.Name}", e); Log.Exception(ClassName, $"Couldn't load assembly for the plugin: {metadata.Name}", e);
} }
catch (InvalidOperationException e) catch (InvalidOperationException e)
{ {
Log.Exception($"|PluginsLoader.DotNetPlugins|Can't find the required IPlugin interface for the plugin: <{metadata.Name}>", e); Log.Exception(ClassName, $"Can't find the required IPlugin interface for the plugin: <{metadata.Name}>", e);
} }
catch (ReflectionTypeLoadException e) catch (ReflectionTypeLoadException e)
{ {
Log.Exception($"|PluginsLoader.DotNetPlugins|The GetTypes method was unable to load assembly types for the plugin: <{metadata.Name}>", e); Log.Exception(ClassName, $"The GetTypes method was unable to load assembly types for the plugin: <{metadata.Name}>", e);
} }
catch (Exception e) catch (Exception e)
{ {
Log.Exception($"|PluginsLoader.DotNetPlugins|The following plugin has errored and can not be loaded: <{metadata.Name}>", e); Log.Exception(ClassName, $"The following plugin has errored and can not be loaded: <{metadata.Name}>", e);
} }
#endif #endif

64
Flow.Launcher.Infrastructure/Logger/Log.cs
View file

@ -94,13 +94,6 @@ namespace Flow.Launcher.Infrastructure.Logger
logger.Fatal(message); logger.Fatal(message);
} }
private static bool FormatValid(string message)
{
var parts = message.Split('|');
var valid = parts.Length == 3 && !string.IsNullOrWhiteSpace(parts[1]) && !string.IsNullOrWhiteSpace(parts[2]);
return valid;
}
public static void Exception(string className, string message, System.Exception exception, [CallerMemberName] string methodName = "") public static void Exception(string className, string message, System.Exception exception, [CallerMemberName] string methodName = "")
{ {
exception = exception.Demystify(); exception = exception.Demystify();
@ -135,57 +128,14 @@ namespace Flow.Launcher.Infrastructure.Logger
return className; return className;
} }
#if !DEBUG
private static void ExceptionInternal(string classAndMethod, string message, System.Exception e) private static void ExceptionInternal(string classAndMethod, string message, System.Exception e)
{ {
var logger = LogManager.GetLogger(classAndMethod); var logger = LogManager.GetLogger(classAndMethod);
logger.Error(e, message); logger.Error(e, message);
} }
private static void LogInternal(string message, LogLevel level)
{
if (FormatValid(message))
{
var parts = message.Split('|');
var prefix = parts[1];
var unprefixed = parts[2];
var logger = LogManager.GetLogger(prefix);
logger.Log(level, unprefixed);
}
else
{
LogFaultyFormat(message);
}
}
/// Example: "|ClassName.MethodName|Message"
/// <param name="message">Example: "|ClassName.MethodName|Message" </param>
/// <param name="e">Exception</param>
public static void Exception(string message, System.Exception e)
{
e = e.Demystify();
#if DEBUG
ExceptionDispatchInfo.Capture(e).Throw();
#else
if (FormatValid(message))
{
var parts = message.Split('|');
var prefix = parts[1];
var unprefixed = parts[2];
ExceptionInternal(prefix, unprefixed, e);
}
else
{
LogFaultyFormat(message);
}
#endif #endif
}
/// Example: "|ClassName.MethodName|Message"
public static void Error(string message)
{
LogInternal(message, LogLevel.Error);
}
public static void Error(string className, string message, [CallerMemberName] string methodName = "") public static void Error(string className, string message, [CallerMemberName] string methodName = "")
{ {
@ -206,23 +156,11 @@ namespace Flow.Launcher.Infrastructure.Logger
LogInternal(LogLevel.Debug, className, message, methodName); LogInternal(LogLevel.Debug, className, message, methodName);
} }
/// Example: "|ClassName.MethodName|Message""
public static void Debug(string message)
{
LogInternal(message, LogLevel.Debug);
}
public static void Info(string className, string message, [CallerMemberName] string methodName = "") public static void Info(string className, string message, [CallerMemberName] string methodName = "")
{ {
LogInternal(LogLevel.Info, className, message, methodName); LogInternal(LogLevel.Info, className, message, methodName);
} }
/// Example: "|ClassName.MethodName|Message"
public static void Info(string message)
{
LogInternal(message, LogLevel.Info);
}
public static void Warn(string className, string message, [CallerMemberName] string methodName = "") public static void Warn(string className, string message, [CallerMemberName] string methodName = "")
{ {
LogInternal(LogLevel.Warn, className, message, methodName); LogInternal(LogLevel.Warn, className, message, methodName);

4
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -222,7 +222,7 @@ namespace Flow.Launcher.ViewModel
#if DEBUG #if DEBUG
throw t.Exception; throw t.Exception;
#else #else
Log.Error($"Error happen in task dealing with viewupdate for results. {t.Exception}"); App.API.LogError(ClassName, $"Error happen in task dealing with viewupdate for results. {t.Exception}");
_resultsViewUpdateTask = _resultsViewUpdateTask =
Task.Run(UpdateActionAsync).ContinueWith(continueAction, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Default); Task.Run(UpdateActionAsync).ContinueWith(continueAction, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Default);
#endif #endif
@ -892,7 +892,7 @@ namespace Flow.Launcher.ViewModel
#if DEBUG #if DEBUG
throw new NotImplementedException("ResultAreaColumn should match ResultAreaColumnPreviewShown/ResultAreaColumnPreviewHidden value"); throw new NotImplementedException("ResultAreaColumn should match ResultAreaColumnPreviewShown/ResultAreaColumnPreviewHidden value");
#else #else
Log.Error("MainViewModel", "ResultAreaColumnPreviewHidden/ResultAreaColumnPreviewShown int value not implemented", "InternalPreviewVisible"); App.API.LogError(ClassName, "ResultAreaColumnPreviewHidden/ResultAreaColumnPreviewShown int value not implemented", "InternalPreviewVisible");
return false; return false;
#endif #endif
} }