Merge #2382 More verbose and accurate version displays

KSP-CKAN · Mar 22, 2018 · 1835b2d · 1835b2d
2 parents 5479760 + 4b510d3
commit 1835b2d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Allow downloader to be used multiple times (#2365 by: HebaruSan; reviewed: politas)
 - [GUI] Clean up URL Handler registration (#2366 by: HebaruSan; reviewed: politas)
 - [Multiple] Deal with threading and download errors (#2374 by: HebaruSan; reviewed: politas)
+- [GUI] More verbose and accurate version displays (#2382 by: HebaruSan; reviewed: politas)
 
 ### Internal
 

diff --git a/GUI/GUIMod.cs b/GUI/GUIMod.cs
@@ -115,7 +115,7 @@ public GUIMod(CkanModule mod, IRegistryQuerier registry, KspVersionCriteria curr
             // KSP.
             if (latest_available_for_any_ksp != null)
             {
-                KSPCompatibility = KSPCompatibilityLong = latest_available_for_any_ksp.HighestCompatibleKSP();
+                KSPCompatibility = KSPCompatibilityLong = registry.LatestCompatibleKSP(mod.identifier)?.ToString() ?? "";
 
                 // If the mod we have installed is *not* the mod we have installed, or we don't know
                 // what we have installed, indicate that an upgrade would be needed.

diff --git a/GUI/MainAllModVersions.Designer.cs b/GUI/MainAllModVersions.Designer.cs
diff --git a/GUI/MainAllModVersions.cs b/GUI/MainAllModVersions.cs
@@ -63,10 +63,13 @@ public GUIMod SelectedModule
                 bool latestCompatibleVersionAlreadyFound = false;
                 VersionsListView.Items.AddRange(allAvailableVersions.Select(module =>
                 {
+                    ModuleVersion minMod = null, maxMod = null;
+                    KspVersion    minKsp = null, maxKsp = null;
+                    Registry.GetMinMaxVersions(new List<CkanModule>() {module}, out minMod, out maxMod, out minKsp, out maxKsp);
                     ListViewItem toRet = new ListViewItem(new string[]
                         {
                             module.version.ToString(),
-                            module.HighestCompatibleKSP()
+                            KspVersionRange.VersionSpan(minKsp, maxKsp).ToString()
                         })
                     {
                         Tag  = module

diff --git a/GUI/MainInstall.cs b/GUI/MainInstall.cs
@@ -421,11 +421,18 @@ private void UpdateProvidedModsDialog(TooManyModsProvideKraken tooManyProvides,
 
             foreach (CkanModule module in tooManyProvides.modules)
             {
-                ListViewItem item = new ListViewItem {Tag = module, Checked = false, Text = module.name};
-
-
-                ListViewItem.ListViewSubItem description =
-                    new ListViewItem.ListViewSubItem {Text = module.@abstract};
+                ListViewItem item = new ListViewItem()
+                {
+                    Tag = module,
+                    Checked = false,
+                    Text = CurrentInstance.Cache.IsMaybeCachedZip(module)
+                        ? $"{module.name} {module.version} (cached)"
+                        : $"{module.name} {module.version} ({module.download.Host ?? ""}, {CkanModule.FmtSize(module.download_size)})"
+                };
+                ListViewItem.ListViewSubItem description = new ListViewItem.ListViewSubItem()
+                {
+                    Text = module.@abstract
+                };
 
                 item.SubItems.Add(description);
                 ChooseProvidedModsListView.Items.Add(item);