Merge pull request 'remove net6 pre-check' (#75) from waffle.lord/SPT-AKI-Installer:rm/net6-check into master

Reviewed-on: CWX/SPT-AKI-Installer#75

README.md

@@ -1,20 +1,20 @@
 # SPT-AKI Installer made for EFT.
 
-![Installer Image](https://media.discordapp.net/attachments/875707258074447904/1107352250705268807/image.png?width=1148&height=671)
+<img src="https://i.imgur.com/jtlwLsr.png" alt="spt installer 2.59" width="700"/>
 
 ### Pre install checks:
 - Checks if .net 4.7.2 (or higher) is installed
-- Checks if .net 6 desktop runtime is installed
-- Checks if EFT is installed,
-- Checks if there is enough space before install,
-- Checks installer is not in OG game directory,
-- Checks install folder does not have game files already in it,
-- Checks if gameversion matches aki version, if so skip patcher process,
+- Checks if .net 8 runtime is installed
+- Checks if EFT is installed
+- Checks if there is enough space before install
+- Checks installer is not in a problematic path
+- Checks install folder does not have game files already in it
+- Checks if gameversion matches aki version, if so skip patcher process
 - Checks both zips are there, other than when the above match, patcher isnt checked for
 - downloads both Zips from the Repo's if needed
 
 ### Installer Processes:
-- Copies files from registry logged GamePath to new location,
-- Extracts, runs and deletes patcher with no user input,
-- Extracts Aki,
-- Deletes both Patcher and AKI zips at the end.
+- Copies files from registry logged GamePath to new location
+- Extracts, runs and deletes patcher with no user input
+- Extracts Aki
+- Deletes both Patcher and AKI zips at the end

SPTInstaller/Helpers/FileHelper.cs

@@ -162,54 +162,49 @@ public static class FileHelper
         }
     }
 
-    private enum PathCheckType
+    public static bool CheckPathForProblemLocations(string path, out PathCheck failedCheck)
     {
-        EndsWith = 0,
-        Contains = 1,
-        DriveRoot = 2
-    }
+        failedCheck = new();
 
-    public static bool CheckPathForProblemLocations(string path, out string detectedName)
-    {
-        detectedName = "";
-
-        var problemNames = new Dictionary<string, PathCheckType>()
+        var problemPaths = new List<PathCheck>()
         {
-            { "Documents", PathCheckType.EndsWith },
-            { "Desktop", PathCheckType.Contains },
-            { "scoped_dir", PathCheckType.Contains },
-            { "Downloads", PathCheckType.Contains },
-            { "OneDrive", PathCheckType.Contains },
-            { "NextCloud", PathCheckType.Contains },
-            { "DropBox", PathCheckType.Contains },
-            { "Google", PathCheckType.Contains },
-            { "Program Files", PathCheckType.Contains },
-            { "Program Files (x86)", PathCheckType.Contains },
-            { "Drive Root", PathCheckType.DriveRoot }
+            new("Documents", PathCheckType.EndsWith, PathCheckAction.Warn),
+            new("Desktop", PathCheckType.EndsWith, PathCheckAction.Deny),
+            new("Battlestate Games", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Desktop", PathCheckType.Contains, PathCheckAction.Warn),
+            new("scoped_dir", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Downloads", PathCheckType.Contains, PathCheckAction.Deny),
+            new("OneDrive", PathCheckType.Contains, PathCheckAction.Deny),
+            new("NextCloud", PathCheckType.Contains, PathCheckAction.Deny),
+            new("DropBox", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Google", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Program Files", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Program Files (x86", PathCheckType.Contains, PathCheckAction.Deny),
+            new("Drive Root", PathCheckType.DriveRoot, PathCheckAction.Deny)
         };
 
-        foreach (var name in  problemNames)
+        foreach (var check in  problemPaths)
         {
-            switch (name.Value)
+            switch (check.CheckType)
             {
                 case PathCheckType.EndsWith:
-                    if (path.ToLower().EndsWith(name.Key.ToLower()))
+                    if (path.ToLower().EndsWith(check.Target.ToLower()))
                     {
-                        detectedName = name.Key;
+                        failedCheck = check;
                         return true;
                     }
                     break;
                 case PathCheckType.Contains:
-                    if (path.ToLower().Contains(name.Key.ToLower()))
+                    if (path.ToLower().Contains(check.Target.ToLower()))
                     {
-                        detectedName = name.Key;
+                        failedCheck = check;
                         return true;
                     }
                     break;
                 case PathCheckType.DriveRoot:
                     if (Regex.Match(path.ToLower(), @"^\w:(\\|\/)$").Success)
                     {
-                        detectedName = name.Key;
+                        failedCheck = check;
                         return true;
                     }
                     break;

SPTInstaller/Installer Tasks/PreChecks/Net8PreCheck.cs

@@ -33,7 +33,8 @@ public class Net8PreCheck : PreCheckBase
 
         try
         {
-            var result = ProcessHelper.RunAndReadProcessOutputs(@"C:\Program Files\dotnet\dotnet.exe", "--list-runtimes");
+            var programFiles = Environment.ExpandEnvironmentVariables("%ProgramW6432%");
+            var result = ProcessHelper.RunAndReadProcessOutputs($@"{programFiles}\dotnet\dotnet.exe", "--list-runtimes");
 
             if (!result.Succeeded)
             {

SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs

@@ -7,6 +7,7 @@ using SPTInstaller.Helpers;
 
 namespace SPTInstaller.Installer_Tasks.PreChecks;
 
+[Obsolete("No longer needed, but keeping around for now just in case. Can be removed from code after 7/1/2024 if no issues are found")]
 public class NetCore6PreCheck : PreCheckBase
 {
     public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", true)
@@ -33,7 +34,8 @@ public class NetCore6PreCheck : PreCheckBase
 
         try
         {
-            var result = ProcessHelper.RunAndReadProcessOutputs(@"C:\Program Files\dotnet\dotnet.exe", "--list-runtimes");
+            var programFiles = Environment.ExpandEnvironmentVariables("%ProgramW6432%");
+            var result = ProcessHelper.RunAndReadProcessOutputs($@"{programFiles}\dotnet\dotnet.exe", "--list-runtimes");
 
             if (!result.Succeeded)
             {

SPTInstaller/Installer Tasks/ReleaseCheckTask.cs

@@ -60,7 +60,7 @@ public class ReleaseCheckTask : InstallerTaskBase
 
             if (comparePatchToAki == null && patchNeedCheck)
             {
-                return Result.FromError("No patcher available for your version");
+                return Result.FromError("No patcher available for your version.\nA patcher is usually created within 24 hours of an EFT update.");
             }
 
             _data.PatchNeeded = patchNeedCheck;

SPTInstaller/Models/PathCheck.cs

@@ -0,0 +1,32 @@
+namespace SPTInstaller.Models;
+
+public enum PathCheckType
+{
+    EndsWith = 0,
+    Contains = 1,
+    DriveRoot = 2
+}
+
+public enum PathCheckAction
+{
+    Warn = 0,
+    Deny = 1,
+}
+
+public class PathCheck
+{
+    public string Target { get; private set; }
+    public PathCheckType CheckType { get; private set; }
+    public PathCheckAction CheckAction { get; private set; }
+
+    public PathCheck()
+    {
+    }
+    
+    public PathCheck(string target, PathCheckType checkType, PathCheckAction checkAction)
+    {
+        Target = target;
+        CheckType = checkType;
+        CheckAction = checkAction;
+    }
+}

SPTInstaller/Program.cs

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

SPTInstaller/SPTInstaller.csproj

@@ -9,8 +9,8 @@
     <PackageIcon>icon.ico</PackageIcon>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
     <Configurations>Debug;Release;TEST</Configurations>
-    <AssemblyVersion>2.55</AssemblyVersion>
-    <FileVersion>2.55</FileVersion>
+    <AssemblyVersion>2.59</AssemblyVersion>
+    <FileVersion>2.59</FileVersion>
     <Company>SPT-AKI</Company>
   </PropertyGroup>
 

SPTInstaller/ViewModels/PreChecksViewModel.cs

@@ -164,19 +164,38 @@ public class PreChecksViewModel : ViewModelBase
 
         Task.Run(async () =>
         {
-            if (FileHelper.CheckPathForProblemLocations(InstallPath, out var detectedName))
+            if (FileHelper.CheckPathForProblemLocations(InstallPath, out var failedCheck ))
             {
-                await Dispatcher.UIThread.InvokeAsync(async () =>
-                {
-                    Log.Warning("Problem folder detected, confirming install path ...");
-                    var confirmation = await DialogHost.Show(new ConfirmationDialog($"We suspect you may be installing into a problematic folder: {detectedName}.\nYou might want to consider installing somewhere else to avoid issues.\n\nAre you sure you want to install to this path?\n{InstallPath}"));
-
-                    if (confirmation == null || !bool.TryParse(confirmation.ToString(), out var confirm) || !confirm)
+                    switch (failedCheck.CheckAction)
                     {
-                        Log.Information("User declined install path, exiting");
-                        Environment.Exit(0);
+                        case PathCheckAction.Warn:
+                        {
+                            await Dispatcher.UIThread.InvokeAsync(async () =>
+                            {
+                                Log.Warning("Problem path detected, confirming install path ...");
+                                var confirmation = await DialogHost.Show(new ConfirmationDialog(
+                                    $"We suspect you may be installing into a problematic folder: {failedCheck.Target}.\nYou might want to consider installing somewhere else to avoid issues.\n\nAre you sure you want to install to this path?\n{InstallPath}"));
+
+                                if (confirmation == null || !bool.TryParse(confirmation.ToString(), out var confirm) ||
+                                    !confirm)
+                                {
+                                    Log.Information("User declined install path, exiting");
+                                    Environment.Exit(0);
+                                }
+                            });
+                            
+                            break;
+                        }
+                        
+                        case PathCheckAction.Deny:
+                        {
+                            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}")));
+                            break;
+                        }
+                        default:
+                            throw new ArgumentOutOfRangeException();
                     }
-                });
 
                 Log.Information("User accepted install path");
             }