DrakiaXYZ/SPT-AKI-Installer
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

write debug log to seperate file

Browse Source
This commit is contained in:
IsWaffle 2024-07-10 13:33:19 -04:00
parent b2b64dcae0
commit c2c1670ab2
9 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SPTInstaller/App.axaml.cs
View File

@ -9,13 +9,16 @@ using SPTInstaller.ViewModels;
using SPTInstaller.Views; using SPTInstaller.Views;
using System.Reactive; using System.Reactive;
using System.Text; using System.Text;
using DynamicData; using SPTInstaller.Helpers;
using SPTInstaller.Models;
namespace SPTInstaller; namespace SPTInstaller;
public partial class App : Application public partial class App : Application
{ {
public static string LogPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "spt-installer", "spt-installer.log"); public static string LogPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "spt-installer", "spt-installer.log");
public static string LogDebugPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"spt-installer", "spt-isntaller-debug.log");
public static void ReLaunch(bool debug, string installPath = "") public static void ReLaunch(bool debug, string installPath = "")
{ {
@ -56,34 +59,38 @@ public partial class App : Application
{ {
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{ {
var debug = false; var data = ServiceHelper.Get<InternalData>() ?? throw new Exception("failed to get internal data");
data.DebugMode = false;
var providedPath = ""; var providedPath = "";
if (desktop.Args != null) if (desktop.Args != null)
{ {
debug = desktop.Args.Any(x => x.ToLower() == "debug"); data.DebugMode = desktop.Args.Any(x => x.ToLower() == "debug");
var installPath = desktop.Args.FirstOrDefault(x => x.StartsWith("installPath=", StringComparison.CurrentCultureIgnoreCase)); var installPath = desktop.Args.FirstOrDefault(x => x.StartsWith("installPath=", StringComparison.CurrentCultureIgnoreCase));
providedPath = installPath != null && installPath.Contains('=') ? installPath?.Split('=')[1] ?? "" : ""; providedPath = installPath != null && installPath.Contains('=') ? installPath?.Split('=')[1] ?? "" : "";
} }
if (debug) if (data.DebugMode)
{ {
Log.CloseAndFlush();
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug() .MinimumLevel.Debug()
.WriteTo .WriteTo
.File(path: LogPath, .File(path: LogDebugPath,
restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Debug) restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Debug)
.CreateLogger(); .CreateLogger();
System.Diagnostics.Trace.Listeners.Add(new SerilogTraceListener.SerilogTraceListener()); Trace.Listeners.Add(new SerilogTraceListener.SerilogTraceListener());
Log.Debug("TraceListener is registered"); Log.Debug("TraceListener is registered");
} }
desktop.MainWindow = new MainWindow desktop.MainWindow = new MainWindow
{ {
DataContext = new MainWindowViewModel(providedPath, debug), DataContext = new MainWindowViewModel(providedPath),
}; };
} }

1
SPTInstaller/Models/InternalData.cs
View File

@ -5,6 +5,7 @@ namespace SPTInstaller.Models;
public class InternalData public class InternalData
{ {
public bool DebugMode { get; set; } = false;
/// <summary> /// <summary>
/// The folder to install SPT into /// The folder to install SPT into
/// </summary> /// </summary>

4
SPTInstaller/SPTInstaller.csproj
View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon> <ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.87</AssemblyVersion> <AssemblyVersion>2.88</AssemblyVersion>
<FileVersion>2.87</FileVersion> <FileVersion>2.88</FileVersion>
<Company>SPT</Company> <Company>SPT</Company>
</PropertyGroup> </PropertyGroup>

6
SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs
View File

@ -13,7 +13,6 @@ namespace SPTInstaller.ViewModels;
public class InstallPathSelectionViewModel : ViewModelBase public class InstallPathSelectionViewModel : ViewModelBase
{ {
private bool _debugging = false;
private InternalData _data; private InternalData _data;
private string _selectedPath; private string _selectedPath;
@ -39,9 +38,8 @@ public class InstallPathSelectionViewModel : ViewModelBase
set => this.RaiseAndSetIfChanged(ref _errorMessage, value); set => this.RaiseAndSetIfChanged(ref _errorMessage, value);
} }
public InstallPathSelectionViewModel(IScreen host, string installPath, bool debugging) : base(host) public InstallPathSelectionViewModel(IScreen host, string installPath) : base(host)
{ {
_debugging = debugging;
_data = ServiceHelper.Get<InternalData?>() ?? throw new Exception("Failed to get internal data"); _data = ServiceHelper.Get<InternalData?>() ?? throw new Exception("Failed to get internal data");
SelectedPath = Environment.CurrentDirectory; SelectedPath = Environment.CurrentDirectory;
ValidPath = false; ValidPath = false;
@ -154,6 +152,6 @@ public class InstallPathSelectionViewModel : ViewModelBase
_data.TargetInstallPath = SelectedPath; _data.TargetInstallPath = SelectedPath;
NavigateTo(new PreChecksViewModel(HostScreen, _debugging)); NavigateTo(new PreChecksViewModel(HostScreen));
} }
} }

8
SPTInstaller/ViewModels/InstallerUpdateViewModel.cs
View File

@ -12,11 +12,9 @@ public class InstallerUpdateViewModel : ViewModelBase
public InstallerUpdateInfo UpdateInfo { get; set; } = new(); public InstallerUpdateInfo UpdateInfo { get; set; } = new();
private InternalData _data; private InternalData _data;
private bool _debugging;
private string _installPath; private string _installPath;
public InstallerUpdateViewModel(IScreen Host, string installPath, bool debugging) : base(Host) public InstallerUpdateViewModel(IScreen Host, string installPath) : base(Host)
{ {
_debugging = debugging;
_installPath = installPath; _installPath = installPath;
_data = ServiceHelper.Get<InternalData>() ?? throw new Exception("Failed to get internal data"); _data = ServiceHelper.Get<InternalData>() ?? throw new Exception("Failed to get internal data");
@ -27,14 +25,14 @@ public class InstallerUpdateViewModel : ViewModelBase
if (!UpdateInfo.UpdateAvailable) if (!UpdateInfo.UpdateAvailable)
{ {
NavigateTo(new OverviewViewModel(HostScreen, _installPath, _debugging)); NavigateTo(new OverviewViewModel(HostScreen, _installPath));
} }
}); });
} }
public void NotNowCommand() public void NotNowCommand()
{ {
NavigateTo(new OverviewViewModel(HostScreen, _installPath, _debugging)); NavigateTo(new OverviewViewModel(HostScreen, _installPath));
} }
public async Task UpdateInstallCommand() public async Task UpdateInstallCommand()

10
SPTInstaller/ViewModels/MainWindowViewModel.cs
View File

@ -3,6 +3,8 @@ using ReactiveUI;
using Serilog; using Serilog;
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
using SPTInstaller.Helpers;
using SPTInstaller.Models;
namespace SPTInstaller.ViewModels; namespace SPTInstaller.ViewModels;
@ -19,10 +21,12 @@ public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScree
set => this.RaiseAndSetIfChanged(ref _title, value); set => this.RaiseAndSetIfChanged(ref _title, value);
} }
public MainWindowViewModel(string installPath, bool debugging) public MainWindowViewModel(string installPath)
{ {
var data = ServiceHelper.Get<InternalData>() ?? throw new Exception("failed to get interanl data");
Title = Title =
$"{(debugging ? "-debug-" : "")} SPT Installer {"v" + Assembly.GetExecutingAssembly().GetName()?.Version?.ToString() ?? "--unknown version--"}"; $"{(data.DebugMode ? "-debug-" : "")} SPT Installer {"v" + Assembly.GetExecutingAssembly().GetName()?.Version?.ToString() ?? "--unknown version--"}";
Log.Information($"========= {Title} Started ========="); Log.Information($"========= {Title} Started =========");
Log.Information(Environment.OSVersion.VersionString); Log.Information(Environment.OSVersion.VersionString);
@ -31,7 +35,7 @@ public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScree
Log.Information("System Language: {iso} - {name}", uiCulture.TwoLetterISOLanguageName, uiCulture.DisplayName); Log.Information("System Language: {iso} - {name}", uiCulture.TwoLetterISOLanguageName, uiCulture.DisplayName);
Router.Navigate.Execute(new InstallerUpdateViewModel(this, installPath, debugging)); Router.Navigate.Execute(new InstallerUpdateViewModel(this, installPath));
} }
public void CloseCommand() public void CloseCommand()

4
SPTInstaller/ViewModels/MessageViewModel.cs
View File

@ -80,6 +80,8 @@ public class MessageViewModel : ViewModelBase
public ICommand CopyLogFileToClipboard => ReactiveCommand.CreateFromTask(async () => public ICommand CopyLogFileToClipboard => ReactiveCommand.CreateFromTask(async () =>
{ {
var data = ServiceHelper.Get<InternalData>();
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{ {
try try
@ -91,7 +93,7 @@ public class MessageViewModel : ViewModelBase
} }
var dataObject = new DataObject(); var dataObject = new DataObject();
var logFile = await desktop.MainWindow.StorageProvider.TryGetFileFromPathAsync(App.LogPath); var logFile = await desktop.MainWindow.StorageProvider.TryGetFileFromPathAsync(data.DebugMode ? App.LogDebugPath : App.LogPath);
if (logFile == null) if (logFile == null)
{ {

6
SPTInstaller/ViewModels/OverviewViewModel.cs
View File

@ -6,11 +6,9 @@ namespace SPTInstaller.ViewModels;
public class OverviewViewModel : ViewModelBase public class OverviewViewModel : ViewModelBase
{ {
private string _providedPath; private string _providedPath;
private bool _debugging; public OverviewViewModel(IScreen Host, string providedPath) : base(Host)
public OverviewViewModel(IScreen Host, string providedPath, bool debugging) : base(Host)
{ {
_providedPath = providedPath; _providedPath = providedPath;
_debugging = debugging;
if (!string.IsNullOrEmpty(_providedPath)) if (!string.IsNullOrEmpty(_providedPath))
{ {
@ -20,6 +18,6 @@ public class OverviewViewModel : ViewModelBase
public void NextCommand() public void NextCommand()
{ {
NavigateTo(new InstallPathSelectionViewModel(HostScreen, _providedPath, _debugging)); NavigateTo(new InstallPathSelectionViewModel(HostScreen, _providedPath));
} }
} }

5
SPTInstaller/ViewModels/PreChecksViewModel.cs
View File

@ -109,12 +109,13 @@ public class PreChecksViewModel : ViewModelBase
}); });
} }
public PreChecksViewModel(IScreen host, bool debugging) : base(host) public PreChecksViewModel(IScreen host) : base(host)
{ {
Debugging = debugging;
var data = ServiceHelper.Get<InternalData?>(); var data = ServiceHelper.Get<InternalData?>();
var installer = ServiceHelper.Get<InstallController?>(); var installer = ServiceHelper.Get<InstallController?>();
Debugging = data.DebugMode;
installer.RecheckRequested += ReCheckRequested; installer.RecheckRequested += ReCheckRequested;
InstallButtonText = "Please wait ..."; InstallButtonText = "Please wait ...";