spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-13 02:10:44 -05:00
Code

Fix: Copying Logs (!65)

Browse Source 
only try to copy logs that exist

Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Co-authored-by: CWX <cwxdev@outlook.com>
Reviewed-on: SPT/Launcher#65
Co-authored-by: waffle.lord <waffle.lord@hotmail.com>
Co-committed-by: waffle.lord <waffle.lord@hotmail.com>
This commit is contained in:
IsWaffle 2024-08-07 13:21:57 +00:00 committed by chomp
parent 6172c800fc
commit 3321146d7b
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -19,7 +19,7 @@ git config --local user.email "USERNAME@SOMETHING.com"
## Requirements
- Escape From Tarkov 30626
- Escape From Tarkov 31124
- .NET 8 SDK
- Visual Studio Code
- [PowerShell v7](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows)

2
project/SPT.Launcher.Base/Controllers/GameStarter.cs
View File

@ -223,7 +223,7 @@ namespace SPT.Launcher
LogManager.Instance.Info($"[LaunchGame] spt-core.dll version: {dllVersion}");
// Edge case, running on locally built modules dlls, ignore check and return ok
if (dllVersion.Major == 0) return false;
if (dllVersion.Major == 1) return false;
// check 'X'.x.x
if (serverVersion.Major != dllVersion.Major) return true;

BIN
project/SPT.Launcher/SPT_Data/Launcher/Patches/SPT-core/EscapeFromTarkov_Data/Managed/Assembly-CSharp.dll.bpf
View File

Binary file not shown.

43
project/SPT.Launcher/ViewModels/SettingsViewModel.cs
View File

@ -2,9 +2,7 @@
using SPT.Launcher.Helpers;
using SPT.Launcher.Models;
using SPT.Launcher.Models.Launcher;
using SPT.Launcher.ViewModels.Dialogs;
using Avalonia;
using Avalonia.Controls;
using ReactiveUI;
using System;
using System.Collections.Generic;
@ -50,19 +48,42 @@ namespace SPT.Launcher.ViewModels
return;
}
var traceLogs = Directory.GetFiles(Path.Join(LauncherSettingsProvider.Instance.GamePath, "Logs"), $"{DateTime.Now:yyyy.MM.dd}_* traces.log", SearchOption.AllDirectories);
var filesToCopy = new List<string> { LogManager.Instance.LogFile };
var traceLog = traceLogs.Length > 0 ? traceLogs[0] : "";
var serverLog = Path.Join(LauncherSettingsProvider.Instance.GamePath, @"\user\logs",
$"server-{DateTime.Now:yyyy-MM-dd}.log");
var bepinexLog = Path.Join(LauncherSettingsProvider.Instance.GamePath, @"BepInEx\LogOutput.log");
var filesToCopy = new string[]
if (AccountManager.SelectedAccount?.id != null)
{
Path.Join(LauncherSettingsProvider.Instance.GamePath, @"\user\logs", $"server-{DateTime.Now:yyyy-MM-dd}.log"),
traceLog,
Path.Join(LauncherSettingsProvider.Instance.GamePath, @"BepInEx\LogOutput.log"),
Path.Join(LauncherSettingsProvider.Instance.GamePath, @"\user\profiles", $"{AccountManager.SelectedAccount.id}.json"),
LogManager.Instance.LogFile,
};
filesToCopy.Add(Path.Join(LauncherSettingsProvider.Instance.GamePath, @"\user\profiles",
$"{AccountManager.SelectedAccount.id}.json"));
}
if (File.Exists(serverLog))
{
filesToCopy.Add(serverLog);
}
if (File.Exists(bepinexLog))
{
filesToCopy.Add(bepinexLog);
}
var logsPath = Path.Join(LauncherSettingsProvider.Instance.GamePath, "Logs");
if (Directory.Exists(logsPath))
{
var traceLogs = Directory.GetFiles(logsPath, $"{DateTime.Now:yyyy.MM.dd}_* traces.log",
SearchOption.AllDirectories);
var log = traceLogs.Length > 0 ? traceLogs[0] : "";
if (!string.IsNullOrWhiteSpace(log))
{
filesToCopy.Add(log);
}
}
List<IStorageFile> files = new List<IStorageFile>();
foreach (var logPath in filesToCopy)