chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [Core] Add option to toggle logger events [GUI/CLI]

Browse Source
This commit is contained in:
Razmoth
2024-01-22 20:22:55 +04:00
parent 0cdad5ef1a
commit 59478d9c05
11 changed files with 125 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
AssetStudio/ILogger.cs
View File

@@ -6,30 +6,40 @@ using System.Text;
namespace AssetStudio
{
[Flags]
public enum LoggerEvent
{
Verbose,
Debug,
Info,
Warning,
Error,
None = 0,
Verbose = 1,
Debug = 2,
Info = 4,
Warning = 8,
Error = 16,
Default = Debug | Info | Warning | Error,
All = Verbose | Debug | Info | Warning | Error,
}
public interface ILogger
{
void Log(LoggerEvent loggerEvent, string message, bool silent = false);
public bool Silent { get; set; }
public LoggerEvent Flags { get; set; }
void Log(LoggerEvent loggerEvent, string message);
}
public sealed class DummyLogger : ILogger
{
public void Log(LoggerEvent loggerEvent, string message, bool silent = false) { }
public bool Silent { get; set; }
public LoggerEvent Flags { get; set; }
public void Log(LoggerEvent loggerEvent, string message) { }
}
public sealed class ConsoleLogger : ILogger
{
public void Log(LoggerEvent loggerEvent, string message, bool silent = false)
public bool Silent { get; set; }
public LoggerEvent Flags { get; set; }
public void Log(LoggerEvent loggerEvent, string message)
{
if (silent)
if (!Flags.HasFlag(loggerEvent) || Silent)
return;
Console.WriteLine("[{0}] {1}", loggerEvent, message);
@@ -41,9 +51,10 @@ namespace AssetStudio
private const string LogFileName = "log.txt";
private const string PrevLogFileName = "log_prev.txt";
private readonly object LockWriter = new object();
private StreamWriter Writer;
public StreamWriter Writer;
public bool Silent { get; set; }
public LoggerEvent Flags { get; set; }
public FileLogger()
{
var logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, LogFileName);
@@ -57,11 +68,11 @@ namespace AssetStudio
}
~FileLogger()
{
Writer?.Dispose();
Dispose();
}
public void Log(LoggerEvent loggerEvent, string message, bool silent = false)
public void Log(LoggerEvent loggerEvent, string message)
{
if (silent)
if (!Flags.HasFlag(loggerEvent) || Silent)
return;
lock (LockWriter)
@@ -69,5 +80,10 @@ namespace AssetStudio
Writer.WriteLine($"[{DateTime.Now}][{loggerEvent}] {message}");
}
}
public void Dispose()
{
Writer?.Dispose();
}
}
}

39
AssetStudio/Logger.cs
View File

@@ -12,8 +12,12 @@ namespace AssetStudio
public static ILogger Default = new DummyLogger();
public static ILogger File;
public static bool Silent = false;
public static bool LogVerbose = false;
public static bool Silent
{
get => Default.Silent;
set => Default.Silent = value;
}
public static bool FileLogging
{
@@ -36,7 +40,7 @@ namespace AssetStudio
}
else
{
((FileLogger)File)?.Writer?.Dispose();
((FileLogger)File)?.Dispose();
File = null;
}
}
@@ -44,41 +48,38 @@ namespace AssetStudio
public static void Verbose(string message)
{
if (LogVerbose)
try
{
try
var callerMethod = new StackTrace().GetFrame(1).GetMethod();
var callerMethodClass = callerMethod.ReflectedType.Name;
if (!string.IsNullOrEmpty(callerMethodClass))
{
var callerMethod = new StackTrace().GetFrame(1).GetMethod();
var callerMethodClass = callerMethod.ReflectedType.Name;
if (!string.IsNullOrEmpty(callerMethodClass))
{
message = $"[{callerMethodClass}] {message}";
}
message = $"[{callerMethodClass}] {message}";
}
catch (Exception) { }
if (FileLogging) File.Log(LoggerEvent.Verbose, message);
Default.Log(LoggerEvent.Verbose, message, Silent);
}
catch (Exception) { }
if (FileLogging) File.Log(LoggerEvent.Verbose, message);
Default.Log(LoggerEvent.Verbose, message);
}
public static void Debug(string message)
{
if (FileLogging) File.Log(LoggerEvent.Debug, message);
Default.Log(LoggerEvent.Debug, message, Silent);
Default.Log(LoggerEvent.Debug, message);
}
public static void Info(string message)
{
if (FileLogging) File.Log(LoggerEvent.Info, message);
Default.Log(LoggerEvent.Info, message, Silent);
Default.Log(LoggerEvent.Info, message);
}
public static void Warning(string message)
{
if (FileLogging) File.Log(LoggerEvent.Warning, message);
Default.Log(LoggerEvent.Warning, message, Silent);
Default.Log(LoggerEvent.Warning, message);
}
public static void Error(string message)
{
if (FileLogging) File.Log(LoggerEvent.Error, message);
Default.Log(LoggerEvent.Error, message, Silent);
Default.Log(LoggerEvent.Error, message);
}
public static void Error(string message, Exception e)
@@ -89,7 +90,7 @@ namespace AssetStudio
message = sb.ToString();
if (FileLogging) File.Log(LoggerEvent.Error, message);
Default.Log(LoggerEvent.Error, message, Silent);
Default.Log(LoggerEvent.Error, message);
}
}
}