Merge pull request #59 from pmonks/dev

Release 2.0.238
pmonks · Jun 13, 2024 · 03e890e · 03e890e
2 parents a80f50f + c2a8a8a
commit 03e890e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/demo-check-asf-policy.png b/demo-check-asf-policy.png
diff --git a/demo-licenses-explain.png b/demo-licenses-explain.png
diff --git a/demo-licenses-summary.png b/demo-licenses-summary.png
diff --git a/src/tools_licenses/tasks.clj b/src/tools_licenses/tasks.clj
@@ -195,13 +195,18 @@
                                 (case (:type %)
                                   :declared  (ansi/fg-bright :green  "Declared")
                                   :concluded (ansi/fg-bright :yellow "Concluded"))
-                                (when-let [confidence (:confidence %)]   (str (ansi/bold "\n  Confidence: ")
-                                                                              (case confidence
-                                                                                :low    (ansi/fg-bright :red    "low")
-                                                                                :medium (ansi/fg-bright :yellow "medium")
-                                                                                :high   (ansi/fg-bright :green  "high"))))
-                                (when-let [strategy   (:strategy %)]     (str (ansi/bold "\n  Strategy: ") (get lcu/strategy->string strategy (name strategy))))
-                                (when-let [source     (seq (map remove-file-prefix (:source %)))] (str (ansi/bold "\n  Source:") "\n    " (s/join "\n    ⮑  " source))))
+                                (when-let [confidence (:confidence %)]
+                                  (str (ansi/bold "\n  Confidence: ")
+                                       (case confidence
+                                         :low    (ansi/fg-bright :red    "low")
+                                         :medium (ansi/fg-bright :yellow "medium")
+                                         :high   (ansi/fg-bright :green  "high"))))
+                                (when-let [confidence-explanations (seq (:confidence-explanations %))]
+                                  (str " (" (s/join ", " (map (fn [exp] (s/replace (name exp) "-" " ")) (sort confidence-explanations))) ")"))
+                                (when-let [strategy (:strategy %)]
+                                  (str (ansi/bold "\n  Strategy: ") (get lcu/strategy->string strategy (name strategy))))
+                                (when-let [source (seq (map remove-file-prefix (:source %)))]
+                                  (str (ansi/bold "\n  Source:") "\n    " (s/join "\n    ⮑  " source))))
                           info-list))))))
 
 (defn- explain-with-licenses!