Changes so that torch update happens ASAP at startup. (#552)

* Changes so that torch update happens ASAP at startup. This should fix our problems with needing manual updates after some game updates.

* revert back to use _fsManager

* Wait for update process to complete before moving on to SE stuff.

Author: Bishbash777

Torch.Server/Managers/InstanceManager.cs

@@ -37,9 +37,7 @@ public class InstanceManager : Manager
         public event Action<ConfigDedicatedViewModel> InstanceLoaded;
         public ConfigDedicatedViewModel DedicatedConfig { get; set; }
         private static readonly Logger Log = LogManager.GetLogger(nameof(InstanceManager));
-        [Dependency]
-        private FilesystemManager _filesystemManager;
-
+        
         public InstanceManager(ITorchBase torchInstance) : base(torchInstance)
         {
 

Torch/Managers/UpdateManager.cs Torch.Server/Managers/UpdateManager.csTorch/Managers/UpdateManager.cs renamed to Torch.Server/Managers/UpdateManager.cs

@@ -5,6 +5,7 @@
 using System.IO.Packaging;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -23,26 +24,25 @@ public class UpdateManager : Manager
         private Timer _updatePollTimer;
         private string _torchDir = new FileInfo(typeof(UpdateManager).Assembly.Location).DirectoryName;
         private Logger _log = LogManager.GetCurrentClassLogger();
-        [Dependency]
         private FilesystemManager _fsManager;
+        private bool _isProcessing = false;
 
         public UpdateManager(ITorchBase torchInstance) : base(torchInstance)
         {
-            //_updatePollTimer = new Timer(TimerElapsed, this, TimeSpan.Zero, TimeSpan.FromMinutes(5));
+            //fs is only really used here so might as well create it here
+            _fsManager = new FilesystemManager(torchInstance);
         }
 
         /// <inheritdoc />
         public override void Attach()
         {
-            CheckAndUpdateTorch();
         }
 
         private void TimerElapsed(object state)
         {
-            CheckAndUpdateTorch();
         }
 
-        private async void CheckAndUpdateTorch()
+        public async void CheckAndUpdateTorch()
         {
             if (Torch.Config.NoUpdate || !Torch.Config.GetTorchUpdates || (Torch.Config.BranchName == TorchBranchType.dev))
                 return;
@@ -53,6 +53,8 @@ private async void CheckAndUpdateTorch()
 
             try
             {
+                _log.Info("Checking for Torch Update...");
+                _isProcessing = true;
                 var job = await JenkinsQuery.Instance.GetLatestVersion(Torch.Config.BranchName.ToString());
                 if (job == null)
                 {
@@ -68,21 +70,26 @@ private async void CheckAndUpdateTorch()
                     if (!await JenkinsQuery.Instance.DownloadRelease(job, updateName))
                     {
                         _log.Warn("Failed to download new release!");
+                        _isProcessing = false;
                         return;
                     }
                     UpdateFromZip(updateName, _torchDir);
                     File.Delete(updateName);
-                    _log.Warn($"Torch version {job.Version} has been installed. Please restart to apply update.");
+                    _log.Warn($"Torch version {job.Version} has been installed.  Restarting...");
+                    Torch.Restart();
                 }
                 else
                 {
                     _log.Info("Torch is up to date.");
                 }
+                _isProcessing = false;
+
             }
             catch (Exception e)
             {
                 _log.Error("An error occured downloading the Torch update.");
                 _log.Error(e);
+                _isProcessing = false;
             }
         }
 
@@ -105,6 +112,15 @@ private void UpdateFromZip(string zipFile, string extractPath)
                 //zip.ExtractToDirectory(extractPath); //throws exceptions sometimes?
             }
         }
+        
+        /// <summary>
+        /// Returns true if update data is being checked or processed.
+        /// </summary>
+        /// <returns></returns>
+        public bool GetIsUpdating()
+        {
+            return _isProcessing;
+        }
 
         /// <inheritdoc />
         public override void Detach()

Torch.Server/Torch.Server.csproj

@@ -146,6 +146,7 @@
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -249,6 +250,7 @@
     <Compile Include="Managers\MultiplayerManagerDedicatedEventShim.cs" />
     <Compile Include="Managers\MultiplayerManagerDedicatedPatchShim.cs" />
     <Compile Include="Managers\RemoteAPIManager.cs" />
+    <Compile Include="Managers\UpdateManager.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="Initializer.cs" />
     <Compile Include="Patches\PromotePatch.cs" />

Torch.Server/TorchServer.cs

@@ -19,6 +19,7 @@
 using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
+using Torch.Managers;
 using Torch.Managers.PatchManager;
 using Torch.Mod;
 using Torch.Mod.Messages;
@@ -65,7 +66,10 @@ public TorchServer(TorchConfig config) : base(config)
             AddManager(DedicatedInstance);
             AddManager(new EntityControlManager(this));
             AddManager(new RemoteAPIManager(this));
-
+            AddManager(new UpdateManager(this));
+            
+            Managers.GetManager<UpdateManager>().CheckAndUpdateTorch();
+            
             var sessionManager = Managers.GetManager<ITorchSessionManager>();
             sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this));
 
@@ -140,6 +144,13 @@ public float SimulationRatio
         /// <inheritdoc />
         public override void Init()
         {
+            var updateManager = Managers.GetManager<UpdateManager>();
+
+            while (updateManager.GetIsUpdating())
+            {
+                //wait until complete, its jank, I know but eventually there will be a stand-alone updater.
+            }
+            
             Log.Info("Initializing server");
             MySandboxGame.IsDedicated = true;
             base.Init();
@@ -207,15 +218,19 @@ public override void Restart(bool save = true)
             void DoRestart(Task<GameSaveResult> task, object torch0)
             {
                 var torch = (TorchServer)torch0;
-                torch.Stop();
-                // TODO clone this
                 var config = (TorchConfig)torch.Config;
+                
+                if (IsRunning)
+                {
+                    config.TempAutostart = true;
+                    torch.Stop();
+                }
+                
                 LogManager.Flush();
 
                 string exe = Assembly.GetExecutingAssembly().Location;
                 Debug.Assert(exe != null);
                 config.WaitForPID = Process.GetCurrentProcess().Id.ToString();
-                config.TempAutostart = true;
                 Process.Start(exe, config.ToString());
 
                 Process.GetCurrentProcess().Kill();

Torch/Managers/FilesystemManager.cs

@@ -9,7 +9,7 @@
 
 namespace Torch.Managers
 {
-    public class FilesystemManager : Manager
+    public class FilesystemManager
     {
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         /// <summary>
@@ -22,7 +22,7 @@ public class FilesystemManager : Manager
         /// </summary>
         public string TorchDirectory { get; }
 
-        public FilesystemManager(ITorchBase torchInstance) : base(torchInstance)
+        public FilesystemManager(ITorchBase torchInstance)
         {
             var torch = new FileInfo(typeof(FilesystemManager).Assembly.Location).Directory.FullName;
             TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;

Torch/Torch.csproj

@@ -268,7 +268,6 @@
     <Compile Include="Managers\Manager.cs" />
     <Compile Include="Managers\NetworkManager\NetworkManager.cs" />
     <Compile Include="Managers\MultiplayerManagerBase.cs" />
-    <Compile Include="Managers\UpdateManager.cs" />
     <Compile Include="Persistent.cs" />
     <Compile Include="Plugins\PluginManifest.cs" />
     <Compile Include="Utils\ModItemUtils.cs" />

Torch/TorchBase.cs

@@ -163,8 +163,6 @@ protected TorchBase(ITorchConfig config)
 
             Managers.AddManager(sessionManager);
             Managers.AddManager(new PatchManager(this));
-            Managers.AddManager(new FilesystemManager(this));
-            Managers.AddManager(new UpdateManager(this));
             Managers.AddManager(new EventManager(this));
             Managers.AddManager(Plugins);
             TorchAPI.Instance = this;