70638340b3
* Ava: Move Ava logging to Logger.Debug Since #4231 we currently redirect Avalonia logs to our Logger, which is pretty nice. But since it uses our Logging level too, it now leads to a massive flood in our Log files. To avoid that, I've included all `AvaLogLevel` to the log message, and make all Ava Logs using `Logger.Debug`. * Logs errors to Error and other to Debug * missing level * keep var
115 lines
4.0 KiB
C#
115 lines
4.0 KiB
C#
using Avalonia.Utilities;
|
|
using System;
|
|
using System.Text;
|
|
|
|
namespace Ryujinx.Ava.UI.Helpers
|
|
{
|
|
using AvaLogger = Avalonia.Logging.Logger;
|
|
using AvaLogLevel = Avalonia.Logging.LogEventLevel;
|
|
using RyuLogger = Ryujinx.Common.Logging.Logger;
|
|
using RyuLogClass = Ryujinx.Common.Logging.LogClass;
|
|
|
|
internal class LoggerAdapter : Avalonia.Logging.ILogSink
|
|
{
|
|
public static void Register()
|
|
{
|
|
AvaLogger.Sink = new LoggerAdapter();
|
|
}
|
|
|
|
private static RyuLogger.Log? GetLog(AvaLogLevel level)
|
|
{
|
|
return level switch
|
|
{
|
|
AvaLogLevel.Verbose => RyuLogger.Debug,
|
|
AvaLogLevel.Debug => RyuLogger.Debug,
|
|
AvaLogLevel.Information => RyuLogger.Debug,
|
|
AvaLogLevel.Warning => RyuLogger.Debug,
|
|
AvaLogLevel.Error => RyuLogger.Error,
|
|
AvaLogLevel.Fatal => RyuLogger.Error,
|
|
_ => throw new ArgumentOutOfRangeException(nameof(level), level, null)
|
|
};
|
|
}
|
|
|
|
public bool IsEnabled(AvaLogLevel level, string area)
|
|
{
|
|
return GetLog(level) != null;
|
|
}
|
|
|
|
public void Log(AvaLogLevel level, string area, object source, string messageTemplate)
|
|
{
|
|
GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, null));
|
|
}
|
|
|
|
public void Log<T0>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0)
|
|
{
|
|
GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0 }));
|
|
}
|
|
|
|
public void Log<T0, T1>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
|
|
{
|
|
GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0, propertyValue1 }));
|
|
}
|
|
|
|
public void Log<T0, T1, T2>(AvaLogLevel level, string area, object source, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
|
|
{
|
|
GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, new object[] { propertyValue0, propertyValue1, propertyValue2 }));
|
|
}
|
|
|
|
public void Log(AvaLogLevel level, string area, object source, string messageTemplate, params object[] propertyValues)
|
|
{
|
|
GetLog(level)?.PrintMsg(RyuLogClass.Ui, Format(level, area, messageTemplate, source, propertyValues));
|
|
}
|
|
|
|
private static string Format(AvaLogLevel level, string area, string template, object source, object[] v)
|
|
{
|
|
var result = new StringBuilder();
|
|
var r = new CharacterReader(template.AsSpan());
|
|
int i = 0;
|
|
|
|
result.Append('[');
|
|
result.Append(level);
|
|
result.Append("] ");
|
|
|
|
result.Append('[');
|
|
result.Append(area);
|
|
result.Append("] ");
|
|
|
|
while (!r.End)
|
|
{
|
|
var c = r.Take();
|
|
|
|
if (c != '{')
|
|
{
|
|
result.Append(c);
|
|
}
|
|
else
|
|
{
|
|
if (r.Peek != '{')
|
|
{
|
|
result.Append('\'');
|
|
result.Append(i < v.Length ? v[i++] : null);
|
|
result.Append('\'');
|
|
r.TakeUntil('}');
|
|
r.Take();
|
|
}
|
|
else
|
|
{
|
|
result.Append('{');
|
|
r.Take();
|
|
}
|
|
}
|
|
}
|
|
|
|
if (source != null)
|
|
{
|
|
result.Append(" (");
|
|
result.Append(source.GetType().Name);
|
|
result.Append(" #");
|
|
result.Append(source.GetHashCode());
|
|
result.Append(')');
|
|
}
|
|
|
|
return result.ToString();
|
|
}
|
|
}
|
|
} |