diff --git a/src/BUTR.CrashReport.Renderer/CrashReportWindow.cs b/src/BUTR.CrashReport.Renderer/CrashReportWindow.cs index a252161..e66b951 100644 --- a/src/BUTR.CrashReport.Renderer/CrashReportWindow.cs +++ b/src/BUTR.CrashReport.Renderer/CrashReportWindow.cs @@ -1,10 +1,9 @@ -using BUTR.CrashReport.Renderer.Controller; +using BUTR.CrashReport.Interfaces; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.Controller; using BUTR.CrashReport.Renderer.ImGui; using BUTR.CrashReport.Renderer.Renderer; -using BUTR.CrashReport.Interfaces; -using BUTR.CrashReport.Models; - using Silk.NET.Core.Loader; using Silk.NET.Input; using Silk.NET.Input.Glfw; @@ -27,20 +26,20 @@ static CrashReportWindow() GlfwWindowing.RegisterPlatform(); } - public static void ShowAndWait(Exception exception, IList logSources, Dictionary additionalMetadata, - ICrashReportMetadataProvider crashReportMetadataProvider, - IStacktraceFilter stacktraceFilter, - IAssemblyUtilities assemblyUtilities, - IModuleProvider moduleProvider, - ILoaderPluginProvider loaderPluginProvider, + public static void ShowAndWait(Exception exception, IList logSources, Dictionary additionalMetadata, + ICrashReportMetadataProvider crashReportMetadataProvider, + IStacktraceFilter stacktraceFilter, + IAssemblyUtilities assemblyUtilities, + IModuleProvider moduleProvider, + ILoaderPluginProvider loaderPluginProvider, IHarmonyProvider harmonyProvider, - IModelConverter modelConverter, - IPathAnonymizer pathAnonymizer, + IModelConverter modelConverter, + IPathAnonymizer pathAnonymizer, ICrashReportRendererUtilities crashReportRendererUtilities) { if (PathResolver.Default is DefaultPathResolver pr) pr.Resolvers = [path => crashReportRendererUtilities.GetNativeLibrariesFolderPath().Select(x => Path.Combine(x, path))]; - + var crashReport = CrashReportInfo.Create(exception, additionalMetadata, stacktraceFilter, assemblyUtilities, moduleProvider, loaderPluginProvider, harmonyProvider); var crashReportModel = CrashReportInfo.ToModel(crashReport, crashReportMetadataProvider, modelConverter, moduleProvider, loaderPluginProvider, assemblyUtilities, pathAnonymizer); diff --git a/src/BUTR.CrashReport.Renderer/ICrashReportRendererUtilities.cs b/src/BUTR.CrashReport.Renderer/ICrashReportRendererUtilities.cs index 9c8eebe..02f9ce5 100644 --- a/src/BUTR.CrashReport.Renderer/ICrashReportRendererUtilities.cs +++ b/src/BUTR.CrashReport.Renderer/ICrashReportRendererUtilities.cs @@ -1,17 +1,17 @@ -using System.Collections.Generic; +using BUTR.CrashReport.Models; -using BUTR.CrashReport.Models; +using System.Collections.Generic; namespace BUTR.CrashReport.Renderer; public interface ICrashReportRendererUtilities { IEnumerable GetNativeLibrariesFolderPath(); - + void Upload(CrashReportModel crashReport, ICollection logSources); - + void CopyAsHtml(CrashReportModel crashReport, ICollection logSources); - + // TODO: Right now we rely on the implementation to provide a dialog and do the save // We should instead do the dialog within ImGui and then provide here the path/stream of where to save the file void SaveCrashReportAsHtml(CrashReportModel crashReport, ICollection logSources, bool addMiniDump, bool addLatestSave, bool addScreenshots); diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.2.Exception.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.2.Exception.cs index 05f0699..46a58c3 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.2.Exception.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.2.Exception.cs @@ -1,6 +1,5 @@ -using BUTR.CrashReport.Renderer.UnsafeUtils; - -using BUTR.CrashReport.Models; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.UnsafeUtils; using System; using System.Linq; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.3.EnhancedStacktrace.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.3.EnhancedStacktrace.cs index 165a915..d5d273c 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.3.EnhancedStacktrace.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.3.EnhancedStacktrace.cs @@ -1,6 +1,5 @@ -using BUTR.CrashReport.Renderer.UnsafeUtils; - -using BUTR.CrashReport.Models; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.UnsafeUtils; using ImGuiNET; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.5.InstalledModules.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.5.InstalledModules.cs index 07f55ca..4dfa148 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.5.InstalledModules.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.5.InstalledModules.cs @@ -1,8 +1,7 @@ -using BUTR.CrashReport.Renderer.Extensions; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.Extensions; using BUTR.CrashReport.Renderer.UnsafeUtils; -using BUTR.CrashReport.Models; - using HonkPerf.NET.RefLinq; using ImGuiNET; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.7.Assemblies.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.7.Assemblies.cs index 1bd731d..9a08caf 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.7.Assemblies.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.7.Assemblies.cs @@ -1,8 +1,7 @@ -using BUTR.CrashReport.Renderer.Extensions; -using BUTR.CrashReport.Renderer.UnsafeUtils; - -using BUTR.CrashReport.Extensions; +using BUTR.CrashReport.Extensions; using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.Extensions; +using BUTR.CrashReport.Renderer.UnsafeUtils; using ImGuiNET; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.8.HarmonyPatches.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.8.HarmonyPatches.cs index 0a65247..c1e3f5d 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.8.HarmonyPatches.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.8.HarmonyPatches.cs @@ -1,9 +1,8 @@ -using BUTR.CrashReport.Renderer.Extensions; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.Extensions; using BUTR.CrashReport.Renderer.UnsafeUtils; using BUTR.CrashReport.Renderer.Utils; -using BUTR.CrashReport.Models; - using HonkPerf.NET.Core; using HonkPerf.NET.RefLinq; using HonkPerf.NET.RefLinq.Enumerators; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.9.LogFiles.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.9.LogFiles.cs index 86bc181..7bd773e 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.9.LogFiles.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.9.LogFiles.cs @@ -1,6 +1,5 @@ -using BUTR.CrashReport.Renderer.Extensions; - -using BUTR.CrashReport.Models; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.Extensions; using HonkPerf.NET.RefLinq; diff --git a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.cs b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.cs index 31159e0..9037452 100644 --- a/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.cs +++ b/src/BUTR.CrashReport.Renderer/Renderer/ImGuiRenderer.cs @@ -1,8 +1,7 @@ -using BUTR.CrashReport.Renderer.ImGui; +using BUTR.CrashReport.Models; +using BUTR.CrashReport.Renderer.ImGui; using BUTR.CrashReport.Renderer.UnsafeUtils; -using BUTR.CrashReport.Models; - using ImGuiNET; using System;