Cleanup fancy printing, add and use configuration

PrimeDecomp · Dec 19, 2023 · 638a7a3 · 638a7a3
1 parent 10cb22b
commit 638a7a3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/configure.py b/configure.py
@@ -137,8 +137,15 @@
     "-fp hardware",
     "-nodefaults",
 ]
+
 config.progress_all = False
 config.progress_modules = False
+config.progress_use_fancy = True
+config.progress_code_fancy_frac = 1499
+config.progress_code_fancy_item = "Energy"
+config.progress_data_fancy_frac = 250
+config.progress_data_fancy_item = "Missiles"
+
 config.build_rels = False
 
 # Base flags, common to most GC/Wii games.

diff --git a/tools/project.py b/tools/project.py
@@ -65,6 +65,13 @@ def __init__(self):
             True  # Include individual modules, disable for large numbers of modules
         )
 
+        # Progress fancy printing
+        self.progress_use_fancy = False
+        self.progress_code_fancy_frac = 0
+        self.progress_code_fancy_item = ""
+        self.progress_data_fancy_frac = 0
+        self.progress_data_fancy_item = ""
+
     def validate(self):
         required_attrs = [
             "build_dir",
@@ -897,12 +904,12 @@ class ProgressUnit:
         def __init__(self, name):
             self.name = name
             self.code_total = 0
-            self.code_fancy_frac = 1499
-            self.code_fancy_item = "energy"
+            self.code_fancy_frac = config.progress_code_fancy_frac
+            self.code_fancy_item = config.progress_code_fancy_item
             self.code_progress = 0
             self.data_total = 0
-            self.data_fancy_frac = 250
-            self.data_fancy_item = "missiles"
+            self.data_fancy_frac = config.progress_data_fancy_frac
+            self.data_fancy_item = config.progress_data_fancy_item
             self.data_progress = 0
             self.objects_progress = 0
             self.objects_total = 0
@@ -976,16 +983,17 @@ def print_category(unit):
         )
         print(f"    Code: {unit.code_progress} / {unit.code_total} bytes")
         print(f"    Data: {unit.data_progress} / {unit.data_total} bytes")
-        print(
-            "\nYou have {} out of {} {} and collected {} out of {} {}.".format(
-                math.floor(code_frac * unit.code_fancy_frac),
-                unit.code_fancy_frac,
-                unit.code_fancy_item,
-                math.floor(data_frac * unit.data_fancy_frac),
-                unit.data_fancy_frac,
-                unit.data_fancy_item,
+        if config.progress_use_fancy:
+            print(
+                "\nYou have {} out of {} {} and collected {} out of {} {}.".format(
+                    math.floor(code_frac * unit.code_fancy_frac),
+                    unit.code_fancy_frac,
+                    unit.code_fancy_item,
+                    math.floor(data_frac * unit.data_fancy_frac),
+                    unit.data_fancy_frac,
+                    unit.data_fancy_item,
+                )
             )
-        )
 
     if all_progress:
         print_category(all_progress)