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

Merge pull request 'fix/error-messages' (#94) from waffle.lord/Installer:fix/error-messages into master

Browse Source 
Reviewed-on: SPT/Installer#94
This commit is contained in:
IsWaffle 2024-06-29 15:43:19 +00:00
commit 0f1d4653a2
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPTInstaller/Installer Tasks/IntializationTask.cs
View File

@ -38,7 +38,7 @@ public class InitializationTask : InstallerTaskBase
if (File.Exists(Path.Join(_data.TargetInstallPath, "EscapeFromTarkov.exe")))
{
return Result.FromError(
"Installer is located in a folder that has existing game files. Please make sure the installer is in an empty folder as per the guide");
"Install location is a folder that has existing game files. Please make the folder doesn't contain an existing spt install");
}
return Result.FromSuccess($"Current Game Version: {_data.OriginalGameVersion}");

16
SPTInstaller/Models/InstallerUpdateInfo.cs
View File

@ -9,9 +9,21 @@ namespace SPTInstaller.Models;
public class InstallerUpdateInfo : ReactiveObject
{
public Version? NewVersion { get; private set; }
private Version? _newVersion;
public string ChangeLog { get; private set; }= "";
public Version? NewVersion
{
get => _newVersion;
set => this.RaiseAndSetIfChanged(ref _newVersion, value);
}
private string _changeLog;
public string ChangeLog
{
get => _changeLog;
set => this.RaiseAndSetIfChanged(ref _changeLog, value);
}
private string _updateInfoText = "";

4
SPTInstaller/SPTInstaller.csproj
View File

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

4
SPTInstaller/ViewModels/PreChecksViewModel.cs
View File

@ -162,7 +162,7 @@ public class PreChecksViewModel : ViewModelBase
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError(
"You have placed the installer in the same folder as EFT. Please move the installer to a seperate folder. Refer to the install guide on where best to place the installer before running it."),
"You have chosen to install in the same folder as EFT. Please choose a another folder. Refer to the install guide on where best to place the installer before running it."),
noLog: true));
return;
}
@ -199,7 +199,7 @@ public class PreChecksViewModel : ViewModelBase
Log.Error("Problem path detected, install denied");
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError(
$"We suspect you may be installing into a problematic folder: {failedCheck.Target}.\nWe won't be letting you install here. Please move the installer to another folder.\nSuggestion: a folder under your drive root, such as 'C:\\spt\\'\nDenied Path: {InstallPath}")));
$"We suspect you may be installing into a problematic folder: {failedCheck.Target}.\nWe won't be letting you install here. How did you do this?")));
break;
}
default: