Merge pull request 'fix/uri-path' (#95) from waffle.lord/Installer:fix/uri-path into master

Reviewed-on: SPT/Installer#95

SPTInstaller/Installer Tasks/PreChecks/EftInstalledPreCheck.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using SPTInstaller.Models;
+
+namespace SPTInstaller.Installer_Tasks.PreChecks;
+
+public class EftInstalledPreCheck : PreCheckBase
+{
+    private InternalData _internalData;
+    
+    public EftInstalledPreCheck(InternalData data) : base("EFT Installed", true)
+    {
+        _internalData = data;
+    }
+    
+    public override async Task<PreCheckResult> CheckOperation()
+    {
+        if (_internalData.OriginalGamePath is null || !Directory.Exists(_internalData.OriginalGamePath) || !File.Exists(Path.Join(_internalData.OriginalGamePath, "Escapefromtarkov.exe")))
+        {
+            return PreCheckResult.FromError("EFT installation could not be found", "Retry", RequestReevaluation);
+        }
+        
+        return PreCheckResult.FromSuccess("EFT install folder found");
+    }
+}

SPTInstaller/Installer Tasks/PreChecks/FreeSpacePreCheck.cs

@@ -33,7 +33,7 @@ public class FreeSpacePreCheck : PreCheckBase
             
             if (eftSourceDirSize == -1)
             {
-                return PreCheckResult.FromError("An error occurred while getting the EFT source directory size");
+                return PreCheckResult.FromError("An error occurred while getting the EFT source directory size. This is most likely because EFT is not installed");
             }
             
             var availableSize = DriveInfo.GetDrives()

SPTInstaller/Program.cs

@@ -44,6 +44,7 @@ internal class Program
         ServiceHelper.Register<InternalData>();
         
 #if !TEST
+        ServiceHelper.Register<PreCheckBase, EftInstalledPreCheck>();
         ServiceHelper.Register<PreCheckBase, NetFramework472PreCheck>();
         ServiceHelper.Register<PreCheckBase, Net8PreCheck>();
         ServiceHelper.Register<PreCheckBase, FreeSpacePreCheck>();

SPTInstaller/SPTInstaller.csproj

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

SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs

@@ -69,7 +69,7 @@ public class InstallPathSelectionViewModel : ViewModelBase
                     Title = "Select a folder to install SPT into"
                 });
             
-            SelectedPath = selections.First().Path.AbsolutePath.Replace("/", "\\");
+            SelectedPath = selections.First().Path.LocalPath;
         } 
     }
     

SPTInstaller/ViewModels/InstallerUpdateViewModel.cs

@@ -21,6 +21,7 @@ public class InstallerUpdateViewModel : ViewModelBase
         Task.Run(async () =>
         {
             await UpdateInfo.CheckForUpdates(Assembly.GetExecutingAssembly().GetName().Version);
+            
             if (!UpdateInfo.UpdateAvailable)
             {
                 NavigateTo(new InstallPathSelectionViewModel(HostScreen, _debugging));

SPTInstaller/Views/InstallerUpdateView.axaml

@@ -13,6 +13,7 @@
             <ScrollViewer MaxHeight="250" Background="#323232">
                 <TextBlock Text="{Binding UpdateInfo.ChangeLog}"
                            TextWrapping="Wrap" MinHeight="100"
+                           Margin="10"
                 />
             </ScrollViewer>
         </StackPanel>