Merge pull request #607 from RichardLake/#602

Fixes: Gui shows non-updateable mods as having a update #602
KSP-CKAN · Dec 17, 2014 · 9884dc1 · 9884dc1
2 parents 7ac407d + bc26535
commit 9884dc1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/CKAN/CKAN/Registry/Registry.cs b/CKAN/CKAN/Registry/Registry.cs
@@ -779,9 +779,19 @@ public bool IsAutodetected(string identifier)
             return IsInstalled(identifier) && InstalledVersion(identifier).ToString().Equals("autodetected dll");
         }
 
-        public bool HasUpdate(string identifier)
+        public bool HasUpdate(string identifier, KSPVersion version)
         {
-            return IsInstalled(identifier) && LatestAvailable(identifier).version.IsGreaterThan(InstalledVersion(identifier));
+            CkanModule newestVersion;
+            try
+            {
+                newestVersion = LatestAvailable(identifier, version);
+            }
+            catch (ModuleNotFoundKraken)
+            {
+                return false;
+            }
+            if (newestVersion == null) return false;
+            return IsInstalled(identifier) && newestVersion.version.IsGreaterThan(InstalledVersion(identifier));
         }
 
         /// <summary>

diff --git a/CKAN/GUI/GUIMod.cs b/CKAN/GUI/GUIMod.cs
@@ -21,20 +21,20 @@ public class GUIMod
         public bool IsUpgradeChecked { get; set; }
 
 
-        public GUIMod(CkanModule mod, Registry registry, KSPVersion ksp_version)
+        public GUIMod(CkanModule mod, Registry registry, KSPVersion current_ksp_version)
         {
             //Currently anything which could alter these causes a full reload of the modlist
             // If this is ever changed these could be moved into the properties
             Mod = mod;
             IsInstalled = registry.IsInstalled(mod.identifier);
             IsInstallChecked = IsInstalled;
-            HasUpdate = registry.HasUpdate(mod.identifier);
-            IsIncompatible = !mod.IsCompatibleKSP(ksp_version);
+            HasUpdate = registry.HasUpdate(mod.identifier, current_ksp_version);
+            IsIncompatible = !mod.IsCompatibleKSP(current_ksp_version);
             IsAutodetected = registry.IsAutodetected(mod.identifier);
             Authors = mod.author == null ? "N/A" : String.Join(",", mod.author);
 
             var installedVersion = registry.InstalledVersion(mod.identifier);
-            var latestVersion = mod.version;
+            var latestVersion = registry.LatestAvailable(mod.identifier);
             var kspVersion = mod.ksp_version;
 
             InstalledVersion = installedVersion != null ? installedVersion.ToString() : "-";

diff --git a/CKAN/Tests/GUI/GUIMod.cs b/CKAN/Tests/GUI/GUIMod.cs
@@ -31,15 +31,14 @@ public void HasUpdateReturnsTrueWhenUpdateAvailible()
 
                 CKAN.KSPManager manager = new CKAN.KSPManager(new NullUser()) { _CurrentInstance = tidy.KSP };
                 var generatror = new RandomModuleGenerator(new Random(0451));
-                var oldVersion = generatror.GeneratorRandomModule(version: new CKAN.Version("0.24"));
-                var newVersion = generatror.GeneratorRandomModule(version: new CKAN.Version("0.25"),
+                var oldVersion = generatror.GeneratorRandomModule(version: new CKAN.Version("0.24"), kspVersion: tidy.KSP.Version());
+                var newVersion = generatror.GeneratorRandomModule(version: new CKAN.Version("0.25"), kspVersion: tidy.KSP.Version(),
                     identifier:oldVersion.identifier);
                 var registry = CKAN.Registry.Empty();
                 registry.RegisterModule(oldVersion, Enumerable.Empty<string>(), null);
                 registry.AddAvailable(newVersion);
-
-
-                var mod = new GUIMod(oldVersion, registry, manager.CurrentInstance.Version());
+
+                var mod = new GUIMod(oldVersion, registry, tidy.KSP.Version());
                 Assert.True(mod.HasUpdate);
             }
         }