branch switching changes

Author: Bishbash777

Torch.API/ITorchConfig.cs

@@ -29,6 +29,7 @@ public interface ITorchConfig
         int WindowHeight { get; set; }
         int FontSize { get; set; }
         UGCServiceType UgcServiceType { get; set; }
+        TorchBranchType BranchName { get; set; }
 
         void Save(string path = null);
     }

Torch.API/TorchBranchType.cs

@@ -9,6 +9,7 @@ namespace Torch.API
     public enum TorchBranchType
     {
         master,
-        staging
+        staging,
+        dev
     }
 }

Torch.API/WebAPI/JenkinsQuery.cs

@@ -65,6 +65,7 @@ public async Task<Job> GetLatestVersion(string branch)
             try
             {
                 job = JsonConvert.DeserializeObject<Job>(r);
+                job.BranchName = response.Name;
             }
             catch (Exception ex)
             {
@@ -109,6 +110,7 @@ public class Build
 
     public class Job
     {
+        public string BranchName;
         public int Number;
         public bool Building;
         public string Description;

Torch.Server/TorchConfig.cs

@@ -41,6 +41,7 @@ public class TorchConfig : CommandLine, ITorchConfig, INotifyPropertyChanged
         private bool _enableAsserts = false;
         private int _fontSize = 16;
         private UGCServiceType _ugcServiceType = UGCServiceType.Steam;
+        private TorchBranchType _torchBranch = TorchBranchType.master;
 
 
         /// <inheritdoc />
@@ -144,7 +145,14 @@ public UGCServiceType UgcServiceType
             set => Set(value, ref _ugcServiceType);
         }
 
-        public string LastUsedTheme { get; set; } = "Torch Theme";
+        [Display(Name = "Torch branch", Description = "Select what branch of torch you want to use.", GroupName = "Server")]
+        public TorchBranchType BranchName
+        {
+            get => _torchBranch;
+            set => Set(value, ref _torchBranch);
+        }
+
+public string LastUsedTheme { get; set; } = "Torch Theme";
 
         //Prevent reserved players being written to disk, but allow it to be read
         //remove this when ReservedPlayers is removed

Torch/Managers/UpdateManager.cs

@@ -49,14 +49,14 @@ private async void CheckAndUpdateTorch()
 
             try
             {
-                var job = await JenkinsQuery.Instance.GetLatestVersion(Torch.TorchVersion.Branch);
+                var job = await JenkinsQuery.Instance.GetLatestVersion(Torch.Config.BranchName.ToString());
                 if (job == null)
                 {
                     _log.Info("Failed to fetch latest version.");
                     return;
                 }
 
-                if (job.Version > Torch.TorchVersion)
+                if (job.Version > Torch.TorchVersion || (Torch.TorchVersion.Branch != Torch.Config.BranchName.ToString()))
                 {
                     _log.Warn($"Updating Torch from version {Torch.TorchVersion} to version {job.Version}");
                     var updateName = Path.Combine(_fsManager.TempDirectory, "torchupdate.zip");