Save Torch config on server start, remove concealment code (moved to plugin)

Author: Jimmacle

Torch.Server/Program.cs

@@ -52,7 +52,7 @@ public static void Main(string[] args)
             {
                 _log.Info($"Generating default config at {configPath}");
                 options = new TorchConfig();
-                options.SaveTo(configPath);
+                options.Save(configPath);
             }
 
             /*

Torch.Server/TorchConfig.cs

@@ -6,9 +6,9 @@
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using NLog;
-using VRage.Dedicated;
+using Sandbox.ModAPI.Ingame;
 
-namespace Torch.Server
+namespace Torch
 {
     public class TorchConfig
     {
@@ -19,13 +19,15 @@ public class TorchConfig
         public int Autosave { get; set; }
         public bool AutoRestart { get; set; }
         public bool LogChat { get; set; }
+        [NonSerialized]
+        private string _path;
 
         public TorchConfig() : this("Torch") { }
 
         public TorchConfig(string instanceName = "Torch", string instancePath = null, int autosaveInterval = 5, bool autoRestart = false)
         {
             InstanceName = instanceName;
-            InstancePath = instancePath ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated", InstanceName);
+            InstancePath = instancePath ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Torch", InstanceName);
             Autosave = autosaveInterval;
             AutoRestart = autoRestart;
         }
@@ -40,6 +42,7 @@ public static TorchConfig LoadFrom(string path)
                 {
                     config = (TorchConfig)serializer.Deserialize(f);
                 }
+                config._path = path;
                 return config;
             }
             catch (Exception e)
@@ -49,8 +52,13 @@ public static TorchConfig LoadFrom(string path)
             }
         }
 
-        public bool SaveTo(string path)
+        public bool Save(string path = null)
         {
+            if (path == null)
+                path = _path;
+            else
+                _path = path;
+
             try
             {
                 var serializer = new XmlSerializer(typeof(TorchConfig));

Torch.Server/TorchServer.cs

@@ -34,24 +34,22 @@ public class TorchServer : TorchBase, ITorchServer
     {
         public Thread GameThread { get; private set; }
         public bool IsRunning { get; private set; }
-        public string InstancePath { get; private set; }
-        public string InstanceName { get; private set; }
+        public TorchConfig Config { get; }
+        public string InstanceName => Config?.InstanceName;
+        public string InstancePath => Config?.InstancePath;
 
         private readonly AutoResetEvent _stopHandle = new AutoResetEvent(false);
 
-        public TorchServer(TorchConfig options = null)
+        public TorchServer(TorchConfig config = null)
         {
-            var opt = options ?? new TorchConfig();
-
-            InstanceName = opt.InstanceName;
-            InstancePath = opt.InstancePath;
+            Config = config ?? new TorchConfig();
         }
 
         public override void Init()
         {
             base.Init();
 
-            Log.Info($"Init server instance '{InstanceName}' at path '{InstancePath}'");
+            Log.Info($"Init server instance '{Config.InstanceName}' at path '{Config.InstancePath}'");
 
             MyFakes.ENABLE_INFINARIO = false;
             MyPerGameSettings.SendLogToKeen = false;
@@ -73,14 +71,6 @@ public void SetConfig(IMyConfigDedicated config)
             MySandboxGame.ConfigDedicated = config;
         }
 
-        public void SetInstance(string path = null, string name = null)
-        {
-            if (path != null)
-                InstancePath = path;
-            if (name != null)
-                InstanceName = name;
-        }
-
         public void Start(IMyConfigDedicated config)
         {
             SetConfig(config);
@@ -95,14 +85,15 @@ public override void Start()
             if (IsRunning)
                 throw new InvalidOperationException("Server is already running.");
 
+            Config.Save();
             IsRunning = true;
             Log.Info("Starting server.");
 
             MySandboxGame.IsDedicated = true;
             Environment.SetEnvironmentVariable("SteamAppId", MyPerServerSettings.AppId.ToString());
 
             Log.Trace("Invoking RunMain");
-            try { Reflection.InvokeStaticMethod(typeof(DedicatedServer), "RunMain", InstanceName, InstancePath, false, true); }
+            try { Reflection.InvokeStaticMethod(typeof(DedicatedServer), "RunMain", Config.InstanceName, Config.InstancePath, false, true); }
             catch (Exception e)
             {
                 Log.Error("Error running server.");

Torch.Server/TorchService.cs

@@ -37,7 +37,7 @@ protected override void OnStart(string[] args)
             if (File.Exists(configName))
                 options = TorchConfig.LoadFrom(configName);
             else
-                options.SaveTo(configName);
+                options.Save(configName);
 
             _server = new TorchServer(options);
             _server.Init();

Torch.Server/Views/TorchUI.xaml.cs

@@ -38,7 +38,7 @@ public partial class TorchUI : Window
 
         public TorchUI(TorchServer server)
         {
-            _config = new TorchConfig();
+            _config = server.Config;
             _server = server;
             InitializeComponent();
             _startTime = DateTime.Now;
@@ -113,7 +113,6 @@ private void InstancePathBox_OnTextChanged(object sender, TextChangedEventArgs e
         {
             var name = (sender as TextBox).Text;
 
-            _server.SetInstance(null, name);
             _config.InstancePath = name;
 
             LoadConfig(_config);