Merge #2286 Show abstracts in available command

KSP-CKAN · Feb 17, 2018 · 37fea0f · 37fea0f
2 parents cb08460 + 05501a7
commit 37fea0f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,8 @@ All notable changes to this project will be documented in this file.
 - [CLI] Add Cmdline import command (#2264 by: HebaruSan; reviewed: politas)
 - [Multiple] User interfaces for auth tokens (#2266 by: HebaruSan; reviewed: politas)
 - [CLI] Add a read-execute-print-loop prompt for Cmdline (#2273 by: HebaruSan; reviewed: politas)
-- [Core] Fallback to archive.org URLs for failed downloads of FOSS packages (#2284: HebaruSan; reviewed: techman83, politas)
+- [Core] Fallback to archive.org URLs for failed downloads of FOSS packages (#2284 by: HebaruSan; reviewed: techman83, politas)
+- [CLI] Show abstracts in available command (#2286 by: HebaruSan; reviewed: politas)
 
 ### Bugfixes
 

diff --git a/Cmdline/Action/Available.cs b/Cmdline/Action/Available.cs
@@ -13,16 +13,26 @@ public Available(IUser user)
 
         public int RunCommand(CKAN.KSP ksp, object raw_options)
         {
-            IRegistryQuerier registry = RegistryManager.Instance(ksp).registry;
-
+            AvailableOptions opts      = (AvailableOptions)raw_options;
+            IRegistryQuerier registry  = RegistryManager.Instance(ksp).registry;
             List<CkanModule> available = registry.Available(ksp.VersionCriteria());
 
             user.RaiseMessage("Mods available for KSP {0}", ksp.Version());
             user.RaiseMessage("");
 
-            foreach (CkanModule module in available)
+            if (opts.detail)
+            {
+                foreach (CkanModule module in available)
+                {
+                    user.RaiseMessage("* {0} ({1}) - {2} - {3}", module.identifier, module.version, module.name, module.@abstract);
+                }
+            }
+            else
             {
-                user.RaiseMessage("* {0} ({1}) - {2}", module.identifier, module.version, module.name);
+                foreach (CkanModule module in available)
+                {
+                    user.RaiseMessage("* {0} ({1}) - {2}", module.identifier, module.version, module.name);
+                }
             }
 
             return Exit.OK;

diff --git a/Cmdline/Options.cs b/Cmdline/Options.cs
@@ -428,7 +428,12 @@ internal class ListOptions : InstanceSpecificOptions
 
     internal class VersionOptions   : CommonOptions { }
     internal class CleanOptions     : InstanceSpecificOptions { }
-    internal class AvailableOptions : InstanceSpecificOptions { }
+
+    internal class AvailableOptions : InstanceSpecificOptions
+    {
+        [Option("detail", HelpText = "Show short description of each module")]
+        public bool detail { get; set; }
+    }
 
     internal class GuiOptions : InstanceSpecificOptions
     {