eclean-pkg: fix output for invalid packages

Signed-off-by: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
Part-of: https://codeberg.org/gentoo/gentoolkit/pulls/4
Merges: https://codeberg.org/gentoo/gentoolkit/pulls/4
Signed-off-by: Sam James <sam@gentoo.org>

Author: laumann

pym/gentoolkit/eclean/cli.py

@@ -667,7 +667,8 @@ def doAction(action, options, exclude={}, output=None):
                 output.set_colors("invalid")
                 output.list_pkgs(invalids)
                 clean_size = cleaner.clean_pkgs(invalids, pkgdir)
-                output.total("invalid", clean_size, len(invalids), verb, action)
+                invalid_count = sum(len(pkgs) for pkgs in invalids.values())
+                output.total("invalid", clean_size, invalid_count, verb, action)
             else:
                 cleaner.clean_pkgs(invalids, pkgdir)
 

pym/gentoolkit/eclean/output.py

@@ -200,17 +200,18 @@ def total(self, mode, size, num_files, verb, action):
             print(" ===========")
             print(self.prettySize(size, True, red), message)
 
-    def list_pkgs(self, pkgs):
+    def list_pkgs(self, loc_pkgs):
         """outputs the packages to stdout
 
-        @param pkgs: dict. of {cat/pkg-ver: src_uri,}
+        @param pkgs: dict. of {location: {cat/pkg-ver: src_uri,} }
         """
         indent = " " * 12
-        keys = sorted(pkgs)
-        for key in keys:
-            if pkgs[key]:
-                saved = ""
-            else:
-                saved = " ...distfile name(s) not known/saved"
-            print(indent, self.pkg_color(key) + saved)
-        print()
+        for pkgs in loc_pkgs.values():
+            keys = sorted(pkgs)
+            for key in keys:
+                if pkgs[key]:
+                    saved = ""
+                else:
+                    saved = " ...distfile name(s) not known/saved"
+                print(indent, self.pkg_color(key) + saved)
+            print()