nercone-modern 1.7.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

nercone_modern/__main__.py

@@ -10,9 +10,9 @@ import time
 from nercone_modern.logging import ModernLogging
 from nercone_modern.progressbar import ModernProgressBar
 
-logger0 = ModernLogging("Demo", display_level="DEBUG", show_level=False)
-show_proc = logger0.prompt("Show process name?", default="N", choices=["y", "N"], interrupt_ignore=True) == "Y"
-show_level = logger0.prompt("Show level name?", default="N", choices=["y", "N"], interrupt_ignore=True) == "Y"
+logger0 = ModernLogging("Demo", display_level="DEBUG", show_proc=False, show_level=False)
+show_proc = logger0.prompt("Show process name?", default="N", choices=["y", "N"], interrupt_ignore=True, level_color="magenta") == "y"
+show_level = logger0.prompt("Show level name?", default="N", choices=["y", "N"], interrupt_ignore=True, level_color="magenta") == "y"
 logger1 = ModernLogging("Main", display_level="DEBUG", show_proc=show_proc, show_level=show_level)
 logger2 = ModernLogging("Sub", display_level="DEBUG", show_proc=show_proc, show_level=show_level)
 
@@ -31,26 +31,24 @@ try:
         raise SystemExit(0)
 
     progress_bar1 = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=False)
-    progress_bar1.setMessage("WAITING")
-    progress_bar2 = ModernProgressBar(total=200, process_name="Task 2", spinner_mode=True)
-    progress_bar2.setMessage("WAITING")
+    progress_bar1.setMessage("Waiting...")
+    progress_bar2 = ModernProgressBar(total=1, process_name="Task 2", spinner_mode=True)
+    progress_bar2.setMessage("Waiting...")
 
     progress_bar1.start()
     progress_bar2.start()
 
-    progress_bar1.setMessage("RUNNING")
+    progress_bar1.setMessage("Running...")
     for i in range(100):
         time.sleep(0.05)
         progress_bar1.update()
-    progress_bar1.setMessage("DONE")
+    progress_bar1.setMessage("Done!")
     progress_bar1.finish()
 
     progress_bar2.spin_start()
-    progress_bar2.setMessage("RUNNING (BACKGROUND)")
-    for i in range(100):
-        time.sleep(0.05)
-        progress_bar2.update(2)
-    progress_bar2.setMessage("DONE")
+    progress_bar2.setMessage("Running with Spinner Mode...")
+    time.sleep(10)
+    progress_bar2.setMessage("Done!")
     progress_bar2.finish()
 except KeyboardInterrupt:
     print()

nercone_modern/progressbar.py

@@ -16,12 +16,13 @@ class ModernProgressBar:
     _last_rendered = False
     _lock = threading.RLock()
 
-    def __init__(self, total: int, process_name: str, spinner_mode: bool = False, primary_color: str = "blue", secondary_color: str = "cyan", box_left: str = "[", box_right: str = "]"):
+    def __init__(self, total: int, process_name: str, spinner_mode: bool = False, primary_color: str = "blue", secondary_color: str = "white", box_color: str = "blue", box_left: str = "[", box_right: str = "]"):
         self.total = total
         self.process_name = process_name.strip()
         self.spinner_mode = spinner_mode
         self.primary_color = primary_color
         self.secondary_color = secondary_color
+        self.box_color = box_color
         self.box_left = box_left
         self.box_right = box_right
         self.current = 0
@@ -30,7 +31,7 @@ class ModernProgressBar:
         self.log_lines = 0
         self.step = 0
         self.spinner_step = 0
-        self.message = "No Message"
+        self.message = "No message"
         self._spinner_thread = None
         self._spinner_stop_event = threading.Event()
         self._spinner_ready = False
@@ -127,14 +128,24 @@ class ModernProgressBar:
             bar = self._progress_bar(progress, advance_spinner=advance_spinner and self._should_spin())
             percentage_value = int(round(min(max(progress, 0), 1) * 100))
             percentage = f"{percentage_value:3d}%"
-            total_width = max(len(str(self.total)), 1)
-            if final:
-                status = f"{self.box_left}DONE{self.box_right}"
-            elif self.spinner_mode and self._spinner_ready:
-                status = f"{self.box_left}RUNN{self.box_right}"
-            else:
-                status = f"{self.box_left}{self.current:>{total_width}}/{self.total}{self.box_right}"
-            line = f"{ModernColor.color(self.primary_color)}{self.box_left}{ModernColor.color('reset')}{ModernColor.color('gray')}{bar}{ModernColor.color('reset')}{ModernColor.color(self.primary_color)}{self.box_right}{ModernColor.color('reset')} {self.process_name} - {'....' if self.spinner_mode else percentage} {status} | {self.message}"
+            if self.current == self.total:
+                percentage = "DONE"
+            percentage_alt = "    "
+            if self.spinner_mode:
+                if self._should_spin():
+                    percentage_alt = "RUNN"
+                else:
+                    percentage_alt = "WAIT"
+            name_width = max(len(bar.process_name) for bar in ModernProgressBar._active_bars) if ModernProgressBar._active_bars else len(self.process_name)
+            proc_name = f"{self.process_name:<{name_width}}"
+            total_width = max(len(str(bar.total)) for bar in ModernProgressBar._active_bars) if ModernProgressBar._active_bars else max(len(str(self.total)), 1)
+            status = ""
+            if not (final or (self.spinner_mode and self._spinner_ready)):
+                if self.spinner_mode:
+                    status = f"{self.box_left}{' ' * total_width}/{' ' * total_width}{self.box_right} "
+                else:
+                    status = f"{self.box_left}{self.current:>{total_width}}/{self.total}{self.box_right} "
+            line = f"{ModernColor.color(self.box_color)}{self.box_left}{ModernColor.color('reset')}{ModernColor.color('gray')}{bar}{ModernColor.color('reset')}{ModernColor.color(self.box_color)}{self.box_right}{ModernColor.color('reset')} {ModernColor.color(self.primary_color)}{proc_name}{ModernColor.color('reset')} {percentage_alt if self.spinner_mode else percentage} {status}{ModernColor.color(self.primary_color)}|{ModernColor.color('reset')} {self.message}"
             total_move_up = self.log_lines + (len(ModernProgressBar._active_bars) - self.index)
             if total_move_up > 0:
                 sys.stdout.write(f"\033[{total_move_up}A")
@@ -158,10 +169,7 @@ class ModernProgressBar:
             filled_bar = "-"
             if self.current <= 0 and not self._spinner_ready:
                 return f"{ModernColor.color('gray')}{empty_bar * (bar_length + 1)}"
-            if self.current == self.total:
-                filled_length = int(progress * bar_length) + 1
-            else:
-                filled_length = int(progress * bar_length)
+            filled_length = int(progress * bar_length) + 1
             return f"{ModernColor.color(self.primary_color)}{filled_bar * filled_length}{ModernColor.color(self.secondary_color)}{center_bar}{ModernColor.color('gray')}{empty_bar * (bar_length - filled_length)}"
         else:
             if self.current <= 0 and not self._spinner_ready:

{nercone_modern-1.7.0.dist-info → nercone_modern-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.7.0
+Version: 1.8.0
 Summary: Modern CLI Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
@@ -13,7 +13,7 @@ Project-URL: Homepage, https://github.com/DiamondGotCat/nercone-modern
 Description-Content-Type: text/markdown
 
 
-<img width="1920" alt="nercone_modern" src="https://github.com/user-attachments/assets/15056f45-ab02-4d0d-b525-4dd51d859738" />
+<img width="1920" alt="nercone_modern" src="https://github.com/user-attachments/assets/58bbaeef-ad81-4105-a5ed-a64d29d91e2c" />
 
 # nercone-modern
 Modern CLI Library

nercone_modern-1.8.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
+nercone_modern/__main__.py,sha256=tiCwzvs4N0J9_vFoA7eaQqkSIhVcDxUQ9uLPNeSQVWo,2475
+nercone_modern/color.py,sha256=e2P9WXeGosHLCAasdE7IQW29GPZOVDMLsUCsLj6hBkM,1268
+nercone_modern/logging.py,sha256=61ixjR37-ewS1RUwnNZnkNGQEBazhiSJJv5g-rLq834,10158
+nercone_modern/progressbar.py,sha256=ohfLTOVPUD9LyvF5AcxtlLqXs0uYO3gUGL9ii8RkZ7E,8504
+nercone_modern/text.py,sha256=eGxGQOJ3b-783ocLibkG62cOcYD4HLG_3diA52tU8jI,1031
+nercone_modern-1.8.0.dist-info/WHEEL,sha256=w4ZtLaDgMAZW2MMZZwtH8zENekoQYBCeullI-zsXJQk,78
+nercone_modern-1.8.0.dist-info/METADATA,sha256=lJcU9MrME8qmxGj6nPrpUEa-nikXdpOp5AvGhwYjISA,6127
+nercone_modern-1.8.0.dist-info/RECORD,,

nercone_modern-1.7.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
-nercone_modern/__main__.py,sha256=5XLj1f0jTdi1IhDq79gXCQeGDIBLAkW4b_PzK9B4zj8,2458
-nercone_modern/color.py,sha256=e2P9WXeGosHLCAasdE7IQW29GPZOVDMLsUCsLj6hBkM,1268
-nercone_modern/logging.py,sha256=61ixjR37-ewS1RUwnNZnkNGQEBazhiSJJv5g-rLq834,10158
-nercone_modern/progressbar.py,sha256=QaDqfxa9XUmI3kfw7ueuRHwylAZGm-L3d7sG7PzV1tE,7782
-nercone_modern/text.py,sha256=eGxGQOJ3b-783ocLibkG62cOcYD4HLG_3diA52tU8jI,1031
-nercone_modern-1.7.0.dist-info/WHEEL,sha256=w4ZtLaDgMAZW2MMZZwtH8zENekoQYBCeullI-zsXJQk,78
-nercone_modern-1.7.0.dist-info/METADATA,sha256=mYxhpUMYgG2N9Fu2XcSudMC3rp7HQt8zwf10BLxKIr4,6127
-nercone_modern-1.7.0.dist-info/RECORD,,