nercone-modern 1.9.1__tar.gz → 1.11.0__tar.gz

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.9.1
+Version: 1.11.0
 Summary: Modern CLI Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "nercone-modern"
-version = "1.9.1"
+version = "1.11.0"
 description = "Modern CLI Library"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/src/nercone_modern/__main__.py

@@ -10,11 +10,9 @@ import time
 from nercone_modern.logging import ModernLogging
 from nercone_modern.progressbar import ModernProgressBar
 
-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)
+logger0 = ModernLogging("Demo", display_level="DEBUG")
+logger1 = ModernLogging("Main", display_level="DEBUG")
+logger2 = ModernLogging("Sub", display_level="DEBUG")
 
 try:
     logger1.log("This is a debug message", "DEBUG")
@@ -52,4 +50,4 @@ try:
     progress_bar2.finish()
 except KeyboardInterrupt:
     print()
-    logger1.log("Aborted.", "INFO")
+    logger0.log("Aborted.", "INFO")

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/src/nercone_modern/color.py

@@ -1,9 +1,17 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# color.py on nercone-modern                                      #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
 class ModernColor:
     def color_by_code(color_code: int | str = 0):
         return f"\033[{color_code}m"
 
     def color(color_name: str = "reset"):
-        if color_name == "reset":
+        if color_name in ("reset", "default"):
             return ModernColor.color_by_code(0)
         elif color_name == "black":
             return ModernColor.color_by_code(30)

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/src/nercone_modern/logging.py

@@ -8,6 +8,7 @@
 
 import sys
 from .color import ModernColor
+from datetime import datetime, timezone
 
 ModernLoggingLevels = ["DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"]
 MAX_LOG_LEVEL_WIDTH = max(len(level) for level in ModernLoggingLevels)
@@ -29,6 +30,7 @@ LEVEL_ALIASES = {
 _last_process = None
 _last_level = None
 _max_proc_width = 0
+_max_prefix_width = 20
 
 def normalize_level(level: str) -> str:
     level = level.strip().upper()
@@ -43,12 +45,11 @@ def is_higher_priority(level_a: str, level_b: str) -> bool:
         raise ValueError(f"Unknown log level: {level_a} or {level_b}")
 
 class ModernLogging:
-    def __init__(self, process_name: str = "App", display_level: str = "INFO", filepath: str | None = None, show_proc: bool | None = None, show_level: bool | None = None):
+    def __init__(self, process_name: str = "App", display_level: str = "INFO", filepath: str | None = None, short_mode: bool = False):
         self.process_name = process_name
         self.display_level = display_level
         self.filepath = filepath
-        self.show_proc = show_proc
-        self.show_level = show_level
+        self.short_mode = short_mode
         global _max_proc_width
         _max_proc_width = max(_max_proc_width, len(process_name))
 
@@ -175,11 +176,8 @@ class ModernLogging:
             return lower_map[stripped.lower()]
         return None
 
-    def make(self, message: str = "", level_text: str = "INFO", level_color: str | None = None, show_proc: bool | None = None, show_level: bool | None = None):
+    def make(self, message: str = "", level_text: str = "INFO", level_color: str | None = None):
         level_text = normalize_level(level_text.strip().upper())
-        system_show_proc = (self.process_name != _last_process)
-        system_show_level = system_show_proc or (level_text != _last_level)
-
         if not level_color:
             if level_text == "DEBUG":
                 level_color = 'gray'
@@ -193,48 +191,15 @@ class ModernLogging:
                 level_color = 'red'
             else:
                 level_color = 'blue'
-
-        if show_proc is None:
-            if self.show_proc is not None:
-                show_proc = self.show_proc
-            else:
-                show_proc = True
-
-        if show_level is None:
-            if self.show_level is not None:
-                show_level = self.show_level
-            else:
-                show_level = True
-
-        return self._make(message=message, level_text=level_text, level_color=level_color, show_proc=show_proc, show_level=show_level, system_show_proc=system_show_proc, system_show_level=system_show_level)
-
-    def _make(self, message: str = "", level_text: str = "INFO", level_color: str = "blue", show_proc: bool = False, show_level: bool = False, system_show_proc: bool = True, system_show_level: bool = True):
-        global _max_proc_width
-        level_width = max(MAX_LOG_LEVEL_WIDTH, len(level_text))
-        color_bar = f"{ModernColor.color(level_color)}|{ModernColor.color('reset')}"
-
-        if not show_proc and not show_level:
-            prefix = ""
-        else:
-            prefix = ""
-            if show_proc:
-                if system_show_proc:
-                    proc_part = self.process_name[:_max_proc_width].ljust(_max_proc_width)
-                else:
-                    proc_part = " " * _max_proc_width
-                prefix += proc_part
-                prefix += " "
-            else:
-                if show_level:
-                    prefix += " " * (_max_proc_width + 1)
-            if show_level:
-                if system_show_level:
-                    level_part = level_text.ljust(level_width)
-                    level_part = f"{ModernColor.color(level_color)}{level_part}{ModernColor.color('reset')}"
-                else:
-                    level_part = " " * level_width
-                prefix += level_part
-                if show_proc:
-                    prefix += " " * (_max_proc_width + 1)
-
-        return f"{prefix}{color_bar} {str(message)}"
+        return self._make(message=message, level_text=level_text, level_color=level_color)
+
+    def _current_time(self) -> str:
+        return datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
+
+    def _make(self, message: str = "", level_text: str = "INFO", level_color: str = "blue"):
+        global _max_proc_width, _max_prefix_width
+        timestamp = self._current_time()
+        log_level = level_text.ljust(MAX_LOG_LEVEL_WIDTH)
+        proc_name = self.process_name.ljust(_max_proc_width)
+        _max_prefix_width = max(_max_prefix_width, len(f"[{timestamp} {log_level} {proc_name}]"))
+        return f"[{timestamp} {ModernColor.color(level_color)}{log_level}{ModernColor.color('reset')} {proc_name}] {message}"

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/src/nercone_modern/progressbar.py

@@ -8,6 +8,7 @@
 
 import sys
 import threading
+from . import logging
 from .color import ModernColor
 from .logging import ModernLogging
 
@@ -16,17 +17,19 @@ 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 = "white", box_color: str = "white", box_left: str = "[", box_right: str = "]", show_bar: bool = True, bar_color: str = "blue"):
+    def __init__(self, total: int, process_name: str, spinner_mode: bool = False, primary_bar: str = "-", secondary_bar: str = "-", centor_bar: str = "-", primary_color: str = "blue", secondary_color: str = "green", third_color: str = "white", box_color: str = "reset", box_left: str = "[", box_right: str = "]"):
         self.total = total
         self.process_name = process_name.strip()
         self.spinner_mode = spinner_mode
+        self.primary_bar = primary_bar
+        self.secondary_bar = secondary_bar
+        self.centor_bar = centor_bar
         self.primary_color = primary_color
         self.secondary_color = secondary_color
+        self.third_color = third_color
         self.box_color = box_color
         self.box_left = box_left
         self.box_right = box_right
-        self.show_bar = show_bar
-        self.bar_color = bar_color
         self.current = 0
         self.index = len(ModernProgressBar._active_bars)
         ModernProgressBar._active_bars.append(self)
@@ -144,10 +147,10 @@ class ModernProgressBar:
             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} "
+                    status = f" ({' ' * total_width}/{' ' * total_width})"
                 else:
-                    status = f"{self.box_left}{self.current:>{total_width}}/{self.total:>{total_width}}{self.box_right} "
-            line = f"{ModernColor.color(self.bar_color)}{'| ' if self.show_bar else ''}{ModernColor.color('reset')}{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}"
+                    status = f" ({self.current:>{total_width}}/{self.total:>{total_width}})"
+            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')} {ModernColor.color(self.secondary_color)}{percentage_alt if self.spinner_mode else percentage}{ModernColor.color('reset')}{ModernColor.color('gray')}{status}{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")
@@ -161,18 +164,16 @@ class ModernProgressBar:
             sys.stdout.flush()
 
     def _progress_bar(self, progress: int, advance_spinner: bool = True):
-        bar_length = 20
+        bar_length = logging._max_prefix_width - 3
         if not self._should_spin():
-            empty_bar = "-"
             if self.current == self.total:
                 center_bar = ""
             else:
-                center_bar = "-"
-            filled_bar = "-"
+                center_bar = self.centor_bar
             if self.current <= 0 and not self._spinner_ready:
-                return f"{ModernColor.color('gray')}{empty_bar * (bar_length + 1)}"
+                return f"{ModernColor.color('gray')}{self.secondary_bar * (bar_length + 1)}"
             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)}"
+            return f"{ModernColor.color(self.primary_color)}{self.primary_bar * filled_length}{ModernColor.color(self.third_color)}{center_bar}{ModernColor.color('gray')}{self.secondary_bar * (bar_length - filled_length)}"
         else:
             if self.current <= 0 and not self._spinner_ready:
                 return f"{ModernColor.color('gray')}{'-' * (bar_length + 1)}"
@@ -181,7 +182,7 @@ class ModernProgressBar:
             spinner_start_bar_length = bar_length - spinner_end_bar_length
             if advance_spinner:
                 self.spinner_step = (self.spinner_step + 1) % (bar_length + 1)
-            return f"{ModernColor.color('gray')}{'-' * spinner_start_bar_length}{ModernColor.color(self.secondary_color)}{'-' * spinner_symbol_length}{ModernColor.color('gray')}{'-' * spinner_end_bar_length}"
+            return f"{ModernColor.color('gray')}{'-' * spinner_start_bar_length}{ModernColor.color(self.third_color)}{'-' * spinner_symbol_length}{ModernColor.color('gray')}{'-' * spinner_end_bar_length}"
 
     def _should_spin(self):
         return self.spinner_mode and self._spinner_ready

{nercone_modern-1.9.1 → nercone_modern-1.11.0}/src/nercone_modern/text.py

@@ -1,3 +1,11 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# text.py on nercone-modern                                       #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
 from typing import Union
 from .color import ModernColor