Merge pull request #34 from Nexus-Mods/19532-manual-install

Skip invisible steps in preset installation

Author: Aragas

src/InstallScripting/XmlScript/XmlScriptExecutor.cs

@@ -119,8 +119,16 @@ public async override Task<IList<Instruction>> DoExecute(IScript scpScript, stri
             if (m_Preset.HasValue)
             {
                 // Preselect options for every step according to the preset (or recommended/default rules).
+                // Skip invisible steps just like manual mode does - this ensures we don't select options
+                // from steps that shouldn't be shown based on current conditions.
                 foreach (var step in lstSteps)
                 {
+                    if (step.VisibilityCondition != null &&
+                        !step.VisibilityCondition.GetIsFulfilled(m_csmState, m_Delegates))
+                    {
+                        continue;
+                    }
+
                     preselectOptions(step);
                     // Ensure required/not-usable flags are applied after preselection.
                     fixSelected(step);

test/TestData/Data/InvisibleStepTest.zip

@@ -33,6 +33,76 @@
         { "type": "copy", "source": "shared\\folder_zzz\\test_alphabetical.txt", "destination": "test_alphabetical.txt", "priority": 0 },
         { "type": "enableallplugins", "priority": 0 }
       ]
+    },
+    {
+      "name": "Invisible Step - Preset mode should skip invisible steps (Option A selected)",
+      "mod": "Invisible Step Test",
+      "archiveFile": "InvisibleStepTest.zip",
+      "pluginPath": "Data",
+      "appVersion": "1.0.0",
+      "gameVersion": "1.0.0",
+      "extenderVersion": "1.0.0",
+      "installedPlugins": [],
+      "preset": [
+        {
+          "name": "Step1",
+          "groups": [
+            {
+              "name": "Group1",
+              "choices": [
+                { "name": "Option A (hides Step 2)", "idx": 0 }
+              ]
+            }
+          ]
+        }
+      ],
+      "validate": true,
+      "expectedMessage": "Installation successful",
+      "expectedInstructions": [
+        { "type": "copy", "source": "visible_step\\visible_file.txt", "destination": "visible_file.txt", "priority": 0 },
+        { "type": "enableallplugins", "priority": 0 }
+      ]
+    },
+    {
+      "name": "Invisible Step - Preset mode should process visible steps (Option B selected)",
+      "mod": "Invisible Step Test",
+      "archiveFile": "InvisibleStepTest.zip",
+      "pluginPath": "Data",
+      "appVersion": "1.0.0",
+      "gameVersion": "1.0.0",
+      "extenderVersion": "1.0.0",
+      "installedPlugins": [],
+      "preset": [
+        {
+          "name": "Step1",
+          "groups": [
+            {
+              "name": "Group1",
+              "choices": [
+                { "name": "Option B (shows Step 2)", "idx": 1 }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "Step2",
+          "groups": [
+            {
+              "name": "InvisibleGroup",
+              "choices": [
+                { "name": "Invisible Option", "idx": 0 }
+              ]
+            }
+          ]
+        }
+      ],
+      "validate": true,
+      "expectedMessage": "Installation successful",
+      "expectedInstructions": [
+        { "type": "copy", "source": "visible_step\\visible_file.txt", "destination": "visible_file.txt", "priority": 0 },
+        { "type": "copy", "source": "invisible_step\\should_not_install.txt", "destination": "should_not_install.txt", "priority": 0 },
+        { "type": "enableallplugins", "priority": 0 }
+      ]
     }
   ]
 }

test/TestData/Shared/fomod-compliance.json

@@ -16,6 +16,7 @@
     <EmbeddedResource Include="Data\Skyrim\Spell Perk Item Distributor-36869-7-1-3-1713397024.7z" />
     <EmbeddedResource Include="Data\Skyrim\XP32 Maximum Skeleton Special Extended-1988-5-06-1707663131.7z" />
     <EmbeddedResource Include="Data\FomodComplianceTests.zip" />
+    <EmbeddedResource Include="Data\InvisibleStepTest.zip" />
     <EmbeddedResource Include="Data\CSharpTestCase.zip" />
   </ItemGroup>