final fix + new config option to change service between Steam and EOS

TorchAPI · Feb 12, 2021 · 169b543 · 169b543
1 parent b372230
commit 169b543
Show file tree

Hide file tree

Showing 18 changed files with 251 additions and 135 deletions.
diff --git a/Torch.API/ITorchConfig.cs b/Torch.API/ITorchConfig.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Torch.API;
 
 namespace Torch
 {
@@ -24,7 +25,11 @@ public interface ITorchConfig
         string ChatColor { get; set; }
         string TestPlugin { get; set; }
         bool DisconnectOnRestart { get; set; }
+        int WindowWidth { get; set; }
+        int WindowHeight { get; set; }
+        int FontSize { get; set; }
+        UGCServiceType UgcServiceType { get; set; }
 
-        bool Save(string path = null);
+        void Save(string path = null);
     }
 }
diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj
@@ -184,8 +184,8 @@
     <Compile Include="Session\ITorchSessionManager.cs" />
     <Compile Include="Session\TorchSessionState.cs" />
     <Compile Include="TorchGameState.cs" />
+    <Compile Include="UGCServiceType.cs" />
     <Compile Include="Utils\ColorUtils.cs" />
-    <Compile Include="Utils\ModItemUtils.cs" />
     <Compile Include="Utils\StringUtils.cs" />
     <Compile Include="WebAPI\JenkinsQuery.cs" />
     <Compile Include="WebAPI\PluginQuery.cs" />

diff --git a/Torch.API/UGCServiceType.cs b/Torch.API/UGCServiceType.cs
@@ -0,0 +1,8 @@
+namespace Torch.API
+{
+    public enum UGCServiceType
+    {
+        Steam,
+        EOS
+    }
+}
diff --git a/Torch.Server/Commands/WhitelistCommands.cs b/Torch.Server/Commands/WhitelistCommands.cs
@@ -41,8 +41,9 @@ public void Off()
         [Command("add", "Add a Steam ID to the whitelist.")]
         public void Add(ulong steamId)
         {
-            if (Config.Whitelist.Add(steamId))
+            if (!Config.Whitelist.Contains(steamId))
             {
+                Config.Whitelist.Add(steamId);
                 Context.Respond($"Added {steamId} to the whitelist.");
                 Config.Save();
             }

diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs
@@ -21,6 +21,9 @@ namespace Torch.Server
 {
     public class Initializer
     {
+        [Obsolete("It's hack. Do not use it!")]
+        internal static Initializer Instance { get; private set; }
+
         private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer));
         private bool _init;
         private const string STEAMCMD_DIR = "steamcmd";
@@ -32,17 +35,17 @@ public class Initializer
 login anonymous
 app_update 298740
 quit";
-
-        private TorchConfig _config;
         private TorchServer _server;
         private string _basePath;
 
-        public TorchConfig Config => _config;
+        internal Persistent<TorchConfig> ConfigPersistent { get; private set; }
+        public TorchConfig Config => ConfigPersistent?.Data;
         public TorchServer Server => _server;
 
         public Initializer(string basePath)
         {
             _basePath = basePath;
+            Instance = this;
         }
 
         public bool Initialize(string[] args)
@@ -94,15 +97,15 @@ public bool Initialize(string[] args)
                 File.Copy(havokSource, havokTarget);
             }
 
-            _config = InitConfig();
-            if (!_config.Parse(args))
+            InitConfig();
+            if (!Config.Parse(args))
                 return false;
 
-            if (!string.IsNullOrEmpty(_config.WaitForPID))
+            if (!string.IsNullOrEmpty(Config.WaitForPID))
             {
                 try
                 {
-                    var pid = int.Parse(_config.WaitForPID);
+                    var pid = int.Parse(Config.WaitForPID);
                     var waitProc = Process.GetProcessById(pid);
                     Log.Info("Continuing in 5 seconds.");
                     Log.Warn($"Waiting for process {pid} to close");
@@ -124,17 +127,17 @@ public bool Initialize(string[] args)
 
         public void Run()
         {
-            _server = new TorchServer(_config);
+            _server = new TorchServer(Config);
 
-            if (_config.NoGui)
+            if (Config.NoGui)
             {
                 _server.Init();
                 _server.Start();
             }
             else
             {
 #if !DEBUG
-                if (!_config.IndependentConsole)
+                if (!Config.IndependentConsole)
                 {
                     Console.SetOut(TextWriter.Null);
                     NativeMethods.FreeConsole();
@@ -145,9 +148,9 @@ public void Run()
                 {
                     _server.Init();
 
-                    if (_config.Autostart || _config.TempAutostart)
+                    if (Config.Autostart || Config.TempAutostart)
                     {
-                        _config.TempAutostart = false;
+                        Config.TempAutostart = false;
                         _server.Start();
                     }
                 });
@@ -159,22 +162,19 @@ public void Run()
             }
         }
 
-        private TorchConfig InitConfig()
+        private void InitConfig()
         {
             var configName = "Torch.cfg";
             var configPath = Path.Combine(Directory.GetCurrentDirectory(), configName);
             if (File.Exists(configName))
             {
-                Log.Info($"Loading config {configPath}");
-                return TorchConfig.LoadFrom(configPath);
+                Log.Info($"Loading config {configName}");
             }
             else
             {
                 Log.Info($"Generating default config at {configPath}");
-                var config = new TorchConfig {InstancePath = Path.GetFullPath("Instance")};
-                config.Save(configPath);
-                return config;
             }
+            ConfigPersistent = Persistent<TorchConfig>.Load(configPath);
         }
 
         public static void RunSteamCmd()
@@ -267,13 +267,13 @@ private void HandleException(object sender, UnhandledExceptionEventArgs e)
                 //MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
             }
             LogManager.Flush();
-            if (_config.RestartOnCrash)
+            if (Config.RestartOnCrash)
             {
                 Console.WriteLine("Restarting in 5 seconds.");
                 Thread.Sleep(5000);
                 var exe = typeof(Program).Assembly.Location;
-                _config.WaitForPID = Process.GetCurrentProcess().Id.ToString();
-                Process.Start(exe, _config.ToString());
+                Config.WaitForPID = Process.GetCurrentProcess().Id.ToString();
+                Process.Start(exe, Config.ToString());
             }
             else
             {

diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
@@ -521,7 +521,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
   <PropertyGroup>