From fbaec8bd100024f867fa9e47a0ad4fc517ea2ff4 Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Mon, 17 Feb 2020 12:16:48 +0100
Subject: [PATCH] Fixed counting packages

Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
---
 slpkg/binary/install.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/slpkg/binary/install.py b/slpkg/binary/install.py
index 6d4d8303..66eb6642 100644
--- a/slpkg/binary/install.py
+++ b/slpkg/binary/install.py
@@ -23,6 +23,7 @@
 
 
 import os
+from itertools import zip_longest
 from pkg_resources import parse_version
 
 from slpkg.utils import Utils
@@ -100,7 +101,7 @@ class BinaryInstall(BlackList):
         self.case_insensitive()
         # fix if packages is for upgrade
         self.is_upgrade = is_upgrade
-        mas_sum = dep_sum = sums = [0, 0, 0]
+        mas_sum = dep_sum = sums = 0, 0, 0, 0
         self.msg.done()
         self.dependencies = self.resolving_deps()
         self.update_deps()
@@ -124,22 +125,23 @@ class BinaryInstall(BlackList):
             if self.dependencies:
                 print("Installing for dependencies:")
                 dep_sum = self.views(self.dep_install, self.dep_comp_sum)
-            # sums[0] --> installed
-            # sums[1] --> upgraded
-            # sums[2] --> uninstall
-            sums = [sum(i) for i in zip(mas_sum, dep_sum)]
+            # sums[0] --> total packages
+            # sums[1] --> reinstall
+            # sums[2] --> upgraded
+            # sums[3] --> uninstall
+            sums = [sum(s) for s in zip_longest(mas_sum, dep_sum)]
             unit, size = units(self.comp_sum + self.dep_comp_sum,
                                self.uncomp_sum + self.dep_uncomp_sum)
             if self.matching and [""] != self.packages:
                 print("\nMatching summary")
                 print("=" * 79)
-                print(f"Total {sum(sums)} matching packages\n")
+                print(f"Total {sums[0]} matching packages\n")
                 raise SystemExit(1)
             print("\nInstalling summary")
             print("=" * 79)
-            print(f"{self.grey}Total {sum(sums)} {self.msg.pkg(sum(sums))}.")
-            print(f"{sums[2]} {self.msg.pkg(sums[2])} will be installed, {sums[1]} will be upgraded and "
-                  f"{sums[0]} will be reinstalled.")
+            print(f"{self.grey}Total {sums[0]} {self.msg.pkg(sums[0])}.")
+            print(f"{sums[3]} {self.msg.pkg(sums[3])} will be installed, {sums[2]} will be upgraded and "
+                  f"{sums[1]} will be reinstalled.")
             print(f"Need to get {size[0]} {unit[0]} of archives.")
             print(f"After this process, {size[1]} {unit[1]} of additional disk "
                   f"space will be used.{self.endc}")
@@ -282,14 +284,16 @@ class BinaryInstall(BlackList):
     def views(self, install, comp_sum):
         """Views packages
         """
-        pkg_sum = uni_sum = upg_sum = 0
+        pkg_sum = uni_sum = upg_sum = res_sum = 0
+
         # fix repositories align
         repo = self.repo + (" " * (6 - (len(self.repo))))
         for pkg, comp in zip(install, comp_sum):
+            pkg_sum += 1
             pkg_repo = split_package(pkg[:-4])
             if find_package(pkg[:-4], self.meta.pkg_path):
                 if "--reinstall" in self.flag:
-                    pkg_sum += 1
+                    res_sum += 1
                 COLOR = self.meta.color["GREEN"]
             elif pkg_repo[0] == GetFromInstalled(pkg_repo[0]).name():
                 COLOR = self.meta.color["YELLOW"]
@@ -303,7 +307,7 @@ class BinaryInstall(BlackList):
                   f"{' ' * (18-len(pkg_repo[1]))} {pkg_repo[2]}"
                   f"{' ' * (8-len(pkg_repo[2]))}{pkg_repo[3]}"
                   f"{' ' * (7-len(pkg_repo[3]))}{repo}{comp:>11}{' K'}")
-        return [pkg_sum, upg_sum, uni_sum]
+        return [pkg_sum, res_sum, upg_sum, uni_sum]
 
     def top_view(self):
         """Print packages status bar