Address comments

Author: daymxn

ci/fireci/fireci/ci_utils.py

@@ -16,7 +16,7 @@
 import os
 import subprocess
 
-from typing import List
+from typing import List, Tuple, Union
 
 _logger = logging.getLogger('fireci.ci_utils')
 
@@ -69,3 +69,22 @@ def get_projects(file_path: str = "subprojects.cfg") -> List[str]:
   with open(file_path, 'r') as file:
     stripped_lines = [line.strip() for line in file]
     return [line for line in stripped_lines if line and not line.startswith('#')]
+
+def counts(arr: List[Union[bool, int]]) -> Tuple[int, int]:
+  """Given an array of booleans and ints, returns a tuple mapping of [true, false]. 
+  Positive int values add to the `true` count while values less than one add to `false`.
+  """
+  true_count = 0
+  false_count = 0
+  for value in arr:
+    if isinstance(value, bool):
+      if value:
+        true_count += 1
+      else:
+        false_count += 1
+    elif value >= 1:
+      true_count += value
+    else:
+      false_count += abs(value) if value < 0 else 1
+
+  return true_count, false_count

ci/fireci/fireci/dir_utils.py

@@ -47,14 +47,13 @@ def rmdir(path: str) -> bool:
 
 def rmglob(pattern: str) -> int:
   """Deletes all files that match a given pattern, and returns the amount of (root) files deleted"""
-  files = 0
-  for file in glob.glob(os.path.expanduser(pattern)):
+  files = glob.glob(os.path.expanduser(pattern))
+  for file in files:
     path = pathlib.Path(file)
     if path.is_dir():
       rmdir(file)
     else:
       _logger.debug(f"Deleting file: {path}")
       os.remove(path)
-    files += 1
-
-  return files
+  
+  return len(files)

ci/fireci/fireciplugins/clean.py

@@ -18,6 +18,8 @@
 from fireci import ci_command
 from fireci import ci_utils
 from fireci import dir_utils
+from typing import Tuple
+from termcolor import colored
 
 log = logging.getLogger('fireci.clean')
 
@@ -63,10 +65,10 @@ def clean(projects, gradle, build, transforms, build_cache, deep, cache):
   if build:
     cleaners.append(delete_build)
   if gradle:
-    cleaners.append(delete_build)
+    cleaners.append(delete_gradle)
 
   results = [call_and_sum(projects, cleaner) for cleaner in cleaners]
-  delete_count = sum(map(int, results))
+  local_count = tuple(map(sum, zip(*results)))
 
   cleaners = []
 
@@ -81,13 +83,21 @@ def clean(projects, gradle, build, transforms, build_cache, deep, cache):
       cleaners.append(delete_build_cache)
 
   results = [cleaner() for cleaner in cleaners]
-  delete_count += sum(map(int, results))
+  system_count = ci_utils.counts(results)
+
+  [deleted, skipped] = tuple(a + b for a, b in zip(local_count, system_count))
+
+  log.info(f"""
+  Clean results:
+
+    {colored("Deleted:", None, attrs=["bold"])} {colored(deleted, "red")}
+    {colored("Already deleted:", None, attrs=["bold"])} {colored(skipped, "grey")}
+  """)
 
-  log.info(f"Deleted {delete_count} directories/files")
 
-def call_and_sum(variables, func) -> int:
+def call_and_sum(variables, func) -> Tuple[int, int]:
   results = map(lambda var: func(var), variables)
-  return sum(map(int, results))
+  return ci_utils.counts(results)
 
 def delete_build(dir: str) -> bool:
   return dir_utils.rmdir(f"{dir}/build")

ci/fireci/setup.cfg

@@ -15,6 +15,7 @@ install_requires =
     requests==2.31.0
     seaborn==0.12.2
     PyYAML==6.0.1
+    termcolor==2.5.0
 
 [options.extras_require]
 test =