Merge #2776 Suppress autostart warning

KSP-CKAN · Jun 10, 2019 · 2afc45b · 2afc45b
2 parents f574d14 + 4fcd298
commit 2afc45b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 27 deletions.
diff --git a/Core/KSPManager.cs b/Core/KSPManager.cs
@@ -24,7 +24,12 @@ public class KSPManager : IDisposable
 
         public string AutoStartInstance
         {
-            get { return Win32Registry.AutoStartInstance; }
+            get
+            {
+                return HasInstance(Win32Registry.AutoStartInstance)
+                    ? Win32Registry.AutoStartInstance
+                    : null;
+            }
             private set
             {
                 if (!String.IsNullOrEmpty(value) && !HasInstance(value))
@@ -94,7 +99,6 @@ internal KSP _GetPreferredInstance()
             // We check both null and "" as we can't write NULL to the registry, so we write an empty string instead
             // This is necessary so we can indicate that the user wants to reset the current AutoStartInstance without clearing the windows registry keys!
             if (!string.IsNullOrEmpty(AutoStartInstance)
-                    && HasInstance(AutoStartInstance)
                     && instances[AutoStartInstance].Valid)
             {
                 return instances[AutoStartInstance];
@@ -143,7 +147,7 @@ public KSP AddInstance(KSP ksp_instance)
             {
                 string name = ksp_instance.Name;
                 instances.Add(name, ksp_instance);
-                Win32Registry.SetRegistryToInstances(instances, AutoStartInstance);
+                Win32Registry.SetRegistryToInstances(instances);
             }
             else
             {
@@ -313,7 +317,7 @@ private bool InstanceNameIsValid(string name)
         public void RemoveInstance(string name)
         {
             instances.Remove(name);
-            Win32Registry.SetRegistryToInstances(instances, AutoStartInstance);
+            Win32Registry.SetRegistryToInstances(instances);
         }
 
         /// <summary>
@@ -326,7 +330,7 @@ public void RenameInstance(string from, string to)
             instances.Remove(from);
             ksp.Name = to;
             instances.Add(to, ksp);
-            Win32Registry.SetRegistryToInstances(instances, AutoStartInstance);
+            Win32Registry.SetRegistryToInstances(instances);
         }
 
         /// <summary>
@@ -418,16 +422,6 @@ public void LoadInstancesFromRegistry()
             }
             string failReason;
             TrySetupCache(Win32Registry.DownloadCacheDir, out failReason);
-
-            try
-            {
-                AutoStartInstance = Win32Registry.AutoStartInstance;
-            }
-            catch (InvalidKSPInstanceKraken e)
-            {
-                log.WarnFormat("Auto-start instance was invalid: {0}", e.Message);
-                AutoStartInstance = null;
-            }
         }
 
         /// <summary>

diff --git a/Core/Registry/Registry.cs b/Core/Registry/Registry.cs
@@ -394,7 +394,6 @@ private void SealionTransaction()
                 }
                 else if (enlisted_tx != current_tx)
                 {
-                    log.Error("CKAN registry does not support nested transactions.");
                     throw new TransactionalKraken("CKAN registry does not support nested transactions.");
                 }
 

diff --git a/Core/Types/CkanModule.cs b/Core/Types/CkanModule.cs
@@ -562,7 +562,6 @@ public CkanModule(string json, IGameComparator comparator)
 
                     string error = String.Format("{0} missing required field {1}", identifier, field);
 
-                    log.Error(error);
                     throw new BadMetadataKraken(null, error);
                 }
             }

diff --git a/Core/Win32Registry.cs b/Core/Win32Registry.cs
@@ -9,7 +9,7 @@ namespace CKAN
     public interface IWin32Registry
     {
         string AutoStartInstance { get; set; }
-        void SetRegistryToInstances(SortedList<string, KSP> instances, string autoStartInstance);
+        void SetRegistryToInstances(SortedList<string, KSP> instances);
         IEnumerable<Tuple<string, string>> GetInstances();
         string GetKSPBuilds();
         void SetKSPBuilds(string buildMap);
@@ -121,9 +121,8 @@ private Tuple<string, string> GetInstance(int i)
                 GetRegistryValue("KSPInstancePath_" + i, string.Empty));
         }
 
-        public void SetRegistryToInstances(SortedList<string, KSP> instances, string autoStartInstance)
+        public void SetRegistryToInstances(SortedList<string, KSP> instances)
         {
-            SetAutoStartInstance(autoStartInstance ?? string.Empty);
             SetNumberOfInstances(instances.Count);
 
             foreach (var instance in instances.Select((instance,i)=>

diff --git a/Netkan/Transformers/EpochTransformer.cs b/Netkan/Transformers/EpochTransformer.cs
@@ -38,7 +38,6 @@ public IEnumerable<Metadata> Transform(Metadata metadata)
                 }
                 else
                 {
-                    Log.Error("Invalid epoch: " + epoch);
                     throw new BadMetadataKraken(null, "Invalid epoch: " + epoch + "In " + json["identifier"]);
                 }
             }

diff --git a/Tests/Core/FakeWin32Registry.cs b/Tests/Core/FakeWin32Registry.cs
@@ -95,11 +95,10 @@ public Tuple<string, string> GetInstance(int i)
         /// <returns>
         /// Returns
         /// </returns>
-        public void SetRegistryToInstances(SortedList<string, CKAN.KSP> instances, string autoStartInstance)
+        public void SetRegistryToInstances(SortedList<string, CKAN.KSP> instances)
         {
             Instances =
                 instances.Select(kvpair => new Tuple<string, string>(kvpair.Key, kvpair.Value.GameDir())).ToList();
-            AutoStartInstance = autoStartInstance;
         }
 
         /// <summary>

diff --git a/Tests/Core/KSPManager.cs b/Tests/Core/KSPManager.cs
@@ -43,9 +43,9 @@ public void HasInstance_ReturnsTrueIfInstanceByThatName()
         }
 
         [Test]
-        public void SetAutoStart_VaildName_SetsAutoStart()
+        public void SetAutoStart_ValidName_SetsAutoStart()
         {
-            Assert.That(manager.AutoStartInstance, Is.EqualTo(string.Empty));
+            Assert.That(manager.AutoStartInstance, Is.EqualTo(null));
 
             manager.SetAutoStart(nameInReg);
             Assert.That(manager.AutoStartInstance, Is.EqualTo(nameInReg));

diff --git a/Tests/Core/Net/Net.cs b/Tests/Core/Net/Net.cs
@@ -18,7 +18,7 @@ private static void BadDownload()
 
         [Test]
         [Category("Online")]
-        public void DownloadThrowsOnInvaildURL()
+        public void DownloadThrowsOnInvalidURL()
         {
             // Download should throw an exception on an invalid URL.
             Assert.That(BadDownload, Throws.Exception);

diff --git a/Tests/NetKAN/MainClass.cs b/Tests/NetKAN/MainClass.cs
@@ -55,10 +55,12 @@ public void ApplyEpochNumber(string json, string orig_version, string new_versio
         }
 
         [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01""}", false)]
+        [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01"", ""x_netkan_epoch"" : ""1""}", false)]
+        [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01"", ""x_netkan_epoch"" : ""3""}", false)]
         [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01"", ""x_netkan_epoch"" : ""a""}", true)]
         [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01"", ""x_netkan_epoch"" : ""-1""}", true)]
         [TestCase(@"{""spec_version"": 1, ""version"" : ""1.01"", ""x_netkan_epoch"" : ""5.5""}", true)]
-        public void Invaild(string json, bool expected_to_throw)
+        public void Invalid(string json, bool expected_to_throw)
         {
             TestDelegate test_delegate = () => new EpochTransformer().Transform(new Metadata(JObject.Parse(json))).First().Json();
             if (expected_to_throw)