wip

Author: FaithBeam

Stalker.Gamma/GammaInstallerServices/GammaInstaller/GammaInstaller.cs

@@ -53,7 +53,7 @@ GammaInstallerArgs args
                         args.Gamma,
                         rec,
                         out var dlRec,
-                        useCurl: !(args.ExperimentalPythonServerSettings?.Enabled ?? false)
+                        useCurl: !args.UseExperimentalPythonServer
                     )
                 )
                 {
@@ -109,7 +109,10 @@ public void BuildSpecialRepoRecords(GammaInstallerArgs args)
     public virtual async Task InstallAsync(GammaInstallerArgs args)
     {
         Task? pythonServerStartTask = null;
-        if (args.ExperimentalPythonServerSettings?.Enabled is true)
+        if (
+            args is
+            { UseExperimentalPythonServer: true, ExperimentalPythonServerSettings: not null }
+        )
         {
             pythonServerStartTask = pythonServerService.StartAsync(
                 args.ExperimentalPythonServerSettings.Host,
@@ -224,10 +227,7 @@ await PreserveUserLtxSettingsService.ReadUserLtxAsync(
             args.CancellationToken
         );
 
-        if (
-            args.ExperimentalPythonServerSettings?.Enabled is true
-            && pythonServerStartTask is not null
-        )
+        if (args.UseExperimentalPythonServer && pythonServerStartTask is not null)
         {
             await pythonServerStartTask;
         }
@@ -394,7 +394,7 @@ public IDownloadableRecord BuildAnomalyRecord(GammaInstallerArgs args)
         var anomalyRecord = downloadableRecordFactory.CreateAnomalyRecord(
             Path.Join(args.Gamma, "downloads"),
             args.Anomaly,
-            useCurl: !(args.ExperimentalPythonServerSettings?.Enabled ?? false)
+            useCurl: !args.UseExperimentalPythonServer
         );
         return args.SkipExtractOnHashMatch
             ? downloadableRecordFactory.CreateSkipExtractWhenNotDownloadedRecord(anomalyRecord)

Stalker.Gamma/GammaInstallerServices/GammaInstaller/GammaInstallerArgs.cs

@@ -16,6 +16,7 @@ public class GammaInstallerArgs
     public bool Offline { get; set; }
     public bool PreserveUserLtx { get; set; }
     public bool PreserveMcmSettings { get; set; }
+    public bool UseExperimentalPythonServer { get; set; }
     public ExperimentalPythonServerSettings? ExperimentalPythonServerSettings { get; set; }
     public string? ModPackMakerPath { get; set; }
     public string? ModListPath { get; set; }

Stalker.Gamma/GammaInstallerServices/GammaInstaller/GammaInstallerArgsBuilder.cs

@@ -16,6 +16,7 @@ public class GammaInstallerArgsBuilder(string anomaly, string gamma, string cach
     private bool _preserveMcmSettings;
     private string? _modPackMakerPath;
     private string? _modListPath;
+    private bool _useExperimentalPythonServer;
     private ExperimentalPythonServerSettings? _experimentalPythonServerSettings;
 
     public GammaInstallerArgsBuilder WithCancellationToken(CancellationToken ct)
@@ -66,6 +67,12 @@ public GammaInstallerArgsBuilder WithPreserveMcmSettings(bool value = true)
         return this;
     }
 
+    public GammaInstallerArgsBuilder WithUseExperimentalPythonServer(bool value = false)
+    {
+        _useExperimentalPythonServer = value;
+        return this;
+    }
+
     public GammaInstallerArgsBuilder WithExperimentalPythonServerSettings(
         ExperimentalPythonServerSettings? value
     )
@@ -116,6 +123,7 @@ public GammaInstallerArgs Build() =>
             ModListPath = _modListPath,
             GroupedAddonRecords = _groupedAddonRecords,
             AnomalyRecord = _anomalyRecord,
+            UseExperimentalPythonServer = _useExperimentalPythonServer,
             ExperimentalPythonServerSettings = _experimentalPythonServerSettings,
         };
 }

Stalker.Gamma/Models/ExperimentalPythonServerSettings.cs

@@ -2,7 +2,6 @@ namespace Stalker.Gamma.Models;
 
 public class ExperimentalPythonServerSettings
 {
-    public bool Enabled { get; set; }
     public required string Host { get; set; }
     public ushort Port { get; set; }
 }

stalker-gamma-cli/Commands/FullInstall.cs

@@ -37,6 +37,7 @@ ProgressLoggingService progressLoggingService
     /// <param name="offline">Perform an offline installation from a cache. This will not download anything if you combine this with --mod-pack-maker-path and --mod-list-path</param>
     /// <param name="preserveUserSettings">Preserve user settings (user.ltx)</param>
     /// <param name="preserveMcmSettings">Preserve MCM settings</param>
+    /// <param name="experimentalPythonServer">Use experimental python server when contacting moddb</param>
     /// <param name="modPackMakerPath">Path to modpack_maker_list.txt. Offline install.</param>
     /// <param name="modListPath">Path to modlist.txt. Offline install.</param>
     /// <param name="downloadThreads">Override downloadThreads defined in your profile</param>
@@ -53,6 +54,7 @@ public async Task<int> FullInstall(
         bool offline = false,
         bool preserveUserSettings = false,
         bool preserveMcmSettings = false,
+        bool experimentalPythonServer = false,
         string? modPackMakerPath = null,
         string? modListPath = null,
         [Range(1, 20)] int? downloadThreads = null,
@@ -116,6 +118,7 @@ out var gammaDbgDispo
                 .WithModListPath(modListPath)
                 .WithPreserveUserLtx(preserveUserSettings)
                 .WithPreserveMcmSettings(preserveMcmSettings)
+                .WithUseExperimentalPythonServer(experimentalPythonServer)
                 .WithExperimentalPythonServerSettings(
                     _cliSettings.ExperimentalModDbSettings.ToServerSettings()
                 )

stalker-gamma-cli/Models/ExperimentalModDbSettings.cs

@@ -8,7 +8,6 @@ public partial class ExperimentalModDbSettingsCtx : JsonSerializerContext;
 
 public class ExperimentalModDbSettings
 {
-    public bool ExperimentalModDbLogicEnabled { get; set; } = false;
     public string Host { get; set; } = "127.0.0.1";
     public ushort Port { get; set; } = 8000;
 
@@ -17,10 +16,6 @@ public bool TrySet(string setting, string value, out string? error)
         error = null;
         switch (setting.ToLowerInvariant())
         {
-            case "experimentalmoddblogicenabled":
-                ExperimentalModDbLogicEnabled = bool.Parse(value);
-                return true;
-
             case "host":
                 Host = value;
                 return true;
@@ -42,10 +37,5 @@ public bool TrySet(string setting, string value, out string? error)
     }
 
     public ExperimentalPythonServerSettings ToServerSettings() =>
-        new()
-        {
-            Enabled = ExperimentalModDbLogicEnabled,
-            Host = Host,
-            Port = Port,
-        };
+        new() { Host = Host, Port = Port };
 }