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

replace path label, general logging additions

Browse Source
This commit is contained in:
IsWaffle 2023-08-02 23:32:44 -04:00
parent 304ffa04a0
commit ab4c61c9ac
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SPTInstaller/Installer Tasks/ReleaseCheckTask.cs
View File

@ -65,12 +65,7 @@ public class ReleaseCheckTask : InstallerTaskBase
_data.PatchNeeded = patchNeedCheck; _data.PatchNeeded = patchNeedCheck;
string status = $"Current Release: {latestAkiVersion}"; string status = $"Current Release: {latestAkiVersion} - {(_data.PatchNeeded ? "Patch Available" : "No Patch Needed")}";
if (_data.PatchNeeded)
{
status += " - Patch Available";
}
SetStatus(null, status); SetStatus(null, status);

4
SPTInstaller/SPTInstaller.csproj
View File

@ -9,8 +9,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.6</AssemblyVersion> <AssemblyVersion>2.7</AssemblyVersion>
<FileVersion>2.6</FileVersion> <FileVersion>2.7</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

5
SPTInstaller/ViewModels/MainWindowViewModel.cs
View File

@ -3,6 +3,7 @@ using Gitea.Client;
using ReactiveUI; using ReactiveUI;
using Serilog; using Serilog;
using SPTInstaller.Models; using SPTInstaller.Models;
using System.Globalization;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -32,6 +33,10 @@ public class MainWindowViewModel : ReactiveObject, IActivatableViewModel, IScree
Log.Information($"========= {Title} Started ========="); Log.Information($"========= {Title} Started =========");
Log.Information(Environment.OSVersion.VersionString); Log.Information(Environment.OSVersion.VersionString);
var uiCulture= CultureInfo.InstalledUICulture;
Log.Information("System Language: {iso} - {name}", uiCulture.TwoLetterISOLanguageName, uiCulture.DisplayName);
Task.Run(async () => Task.Run(async () =>
{ {
await UpdateInfo.CheckForUpdates(version); await UpdateInfo.CheckForUpdates(version);

2
SPTInstaller/ViewModels/PreChecksViewModel.cs
View File

@ -51,6 +51,8 @@ public class PreChecksViewModel : ViewModelBase
data.TargetInstallPath = Environment.CurrentDirectory; data.TargetInstallPath = Environment.CurrentDirectory;
InstallPath = data.TargetInstallPath; InstallPath = data.TargetInstallPath;
Log.Information($"Install Path: {FileHelper.GetRedactedPath(InstallPath)}");
StartInstallCommand = ReactiveCommand.Create(() => StartInstallCommand = ReactiveCommand.Create(() =>
{ {
dismissUpdateCard?.Invoke(); dismissUpdateCard?.Invoke();

8
SPTInstaller/Views/PreChecksView.axaml
View File

@ -11,10 +11,10 @@
<Label Content="SPT will be installed into this folder:" <Label Content="SPT will be installed into this folder:"
HorizontalAlignment="Center" HorizontalAlignment="Center"
/> />
<Label Foreground="DodgerBlue" <TextBlock Text="{Binding InstallPath}" TextWrapping="Wrap"
Content="{Binding InstallPath}" Foreground="DodgerBlue" HorizontalAlignment="Center"
HorizontalAlignment="Center" />
/>
<Label Content="Move the installer into the folder you want it to install into if this is wrong" <Label Content="Move the installer into the folder you want it to install into if this is wrong"
HorizontalAlignment="Center" HorizontalAlignment="Center"
/> />