Use custom logger everywhere.

This commit is contained in:
Ottermandias 2022-09-15 15:02:23 +02:00
parent fabbeeae13
commit 72ef666d51
87 changed files with 276 additions and 371 deletions

View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Numerics;
using Dalamud.Interface;
using Dalamud.Logging;
using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
@ -134,7 +133,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not parse {_fileType} file {_currentPath.File.FullName}:\n{e}" );
Penumbra.Log.Error( $"Could not parse {_fileType} file {_currentPath.File.FullName}:\n{e}" );
_currentFile = null;
}
}

View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Dalamud.Interface;
using Dalamud.Logging;
using ImGuiNET;
using OtterGui;
using OtterGui.Classes;
@ -321,7 +320,7 @@ public partial class ModEditWindow
var failedFiles = _editor!.ApplyFiles();
if( failedFiles > 0 )
{
PluginLog.Information( $"Failed to apply {failedFiles} file redirections to {_editor.CurrentOption.FullName}." );
Penumbra.Log.Information( $"Failed to apply {failedFiles} file redirections to {_editor.CurrentOption.FullName}." );
}
}

View file

@ -5,7 +5,6 @@ using System.Numerics;
using System.Threading.Tasks;
using Dalamud.Interface;
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Logging;
using Dalamud.Utility;
using ImGuiNET;
using ImGuiScene;
@ -429,7 +428,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not parse DDS {path} to RGBA:\n{e}" );
Penumbra.Log.Error( $"Could not parse DDS {path} to RGBA:\n{e}" );
return ( null, 0, 0 );
}
}
@ -449,7 +448,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not parse TEX {path} to RGBA:\n{e}" );
Penumbra.Log.Error( $"Could not parse TEX {path} to RGBA:\n{e}" );
return ( null, 0, 0 );
}
}
@ -466,7 +465,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not parse PNG {path} to RGBA:\n{e}" );
Penumbra.Log.Error( $"Could not parse PNG {path} to RGBA:\n{e}" );
return ( null, 0, 0 );
}
}
@ -520,7 +519,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not load raw image:\n{e}" );
Penumbra.Log.Error( $"Could not load raw image:\n{e}" );
}
}
@ -685,7 +684,7 @@ public partial class ModEditWindow
}
catch( Exception e )
{
PluginLog.Error( $"Could not save image to {path}:\n{e}" );
Penumbra.Log.Error( $"Could not save image to {path}:\n{e}" );
}
}

View file

@ -1,6 +1,5 @@
using Dalamud.Interface;
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Logging;
using ImGuiNET;
using OtterGui;
using OtterGui.Filesystem;
@ -14,7 +13,6 @@ using System.Collections.Concurrent;
using System.IO;
using System.Linq;
using System.Numerics;
using Penumbra.Util;
namespace Penumbra.UI.Classes;
@ -100,7 +98,7 @@ public sealed partial class ModFileSystemSelector : FileSystemSelector< Mod, Mod
}
catch( Exception e )
{
PluginLog.Error( $"Could not create directory for new Mod {_newModName}:\n{e}" );
Penumbra.Log.Error( $"Could not create directory for new Mod {_newModName}:\n{e}" );
}
}
@ -273,13 +271,13 @@ public sealed partial class ModFileSystemSelector : FileSystemSelector< Mod, Mod
}
catch( Exception e )
{
PluginLog.Error( $"Error cleaning up failed mod extraction of {file.FullName} to {dir.FullName}:\n{e}" );
Penumbra.Log.Error( $"Error cleaning up failed mod extraction of {file.FullName} to {dir.FullName}:\n{e}" );
}
}
if( error is not OperationCanceledException )
{
PluginLog.Error( $"Error extracting {file.FullName}, mod skipped:\n{error}" );
Penumbra.Log.Error( $"Error extracting {file.FullName}, mod skipped:\n{error}" );
}
}
else if( dir != null )
@ -445,7 +443,7 @@ public sealed partial class ModFileSystemSelector : FileSystemSelector< Mod, Mod
}
catch( Exception e )
{
PluginLog.Warning(
Penumbra.Log.Warning(
$"Could not move newly imported mod {mod.Name} to default import folder {Penumbra.Config.DefaultImportFolder}:\n{e}" );
}
}

View file

@ -1,4 +1,3 @@
using Lumina.Excel.GeneratedSheets;
using OtterGui.Widgets;
namespace Penumbra.UI;

View file

@ -8,7 +8,6 @@ using OtterGui;
using OtterGui.Raii;
using Penumbra.Collections;
using Penumbra.UI.Classes;
using Penumbra.Util;
namespace Penumbra.UI;

View file

@ -6,7 +6,6 @@ using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Collections;
using Penumbra.Util;
namespace Penumbra.UI;

View file

@ -11,7 +11,6 @@ using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.ByteString;
using Penumbra.Interop.Loader;
using Penumbra.Interop.Resolver;
using Penumbra.Interop.Structs;
using CharacterUtility = Penumbra.Interop.CharacterUtility;

View file

@ -1,4 +1,3 @@
using System;
using System.Linq;
using System.Numerics;
using Dalamud.Interface;
@ -13,7 +12,6 @@ using Penumbra.GameData.ByteString;
using Penumbra.GameData.Enums;
using Penumbra.Interop.Structs;
using Penumbra.UI.Classes;
using Penumbra.Util;
namespace Penumbra.UI;

View file

@ -5,7 +5,6 @@ using System.IO;
using System.Numerics;
using Dalamud.Interface;
using Dalamud.Interface.Components;
using Dalamud.Logging;
using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
@ -51,7 +50,7 @@ public partial class ConfigWindow
}
catch( Exception e )
{
PluginLog.Warning( e.Message );
Penumbra.Log.Warning( e.Message );
}
}

View file

@ -1,4 +1,3 @@
using System;
using System.Numerics;
using Dalamud.Interface;
using ImGuiNET;

View file

@ -7,7 +7,6 @@ using Penumbra.UI.Classes;
using System;
using System.Linq;
using System.Numerics;
using Dalamud.Logging;
namespace Penumbra.UI;
@ -42,8 +41,8 @@ public partial class ConfigWindow
}
catch( Exception e )
{
PluginLog.Error( $"Exception thrown during ModPanel Render:\n{e}" );
PluginLog.Error( $"{Penumbra.ModManager.Count} Mods\n"
Penumbra.Log.Error( $"Exception thrown during ModPanel Render:\n{e}" );
Penumbra.Log.Error( $"{Penumbra.ModManager.Count} Mods\n"
+ $"{Penumbra.CollectionManager.Current.AnonymizedName} Current Collection\n"
+ $"{Penumbra.CollectionManager.Current.Settings.Count} Settings\n"
+ $"{_selector.SortMode.Name} Sort Mode\n"

View file

@ -2,7 +2,6 @@ using System;
using System.Numerics;
using Dalamud.Interface;
using Dalamud.Interface.Windowing;
using Dalamud.Logging;
using ImGuiNET;
using OtterGui.Raii;
using Penumbra.UI.Classes;
@ -92,7 +91,7 @@ public sealed partial class ConfigWindow : Window, IDisposable
}
catch( Exception e )
{
PluginLog.Error( $"Exception thrown during UI Render:\n{e}" );
Penumbra.Log.Error( $"Exception thrown during UI Render:\n{e}" );
}
}