nercone-modern 1.1.0__tar.gz → 1.2.0__tar.gz

{nercone_modern-1.1.0 → nercone_modern-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.1.0
+Version: 1.2.0
 Summary: Modern Logging and Progress Bar Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
@@ -39,20 +39,21 @@ pip3 install nercone-modern
 ## Usage
 
 ```python
-from nercone_modern import NerconeModern
+from nercone_modern.logging import ModernLogging
+from nercone_modern.progressbar import ModernProgressBar
 ```
 
 ### Logging
 
 ```python
-logger = NerconeModern().modernLogging(process_name="Main")
+logger = ModernLogging("Main", display_level="DEBUG")
 logger.log("This is a test message", level="INFO")
 ```
 
 ### Progress Bar
 
 ```python
-progress_bar = NerconeModern().modernProgressBar(total=100, process_name="Task 1", process_color=32, spinner_mode=True)
+progress_bar = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=True)
 progress_bar.start()
 
 time.sleep(5)

{nercone_modern-1.1.0 → nercone_modern-1.2.0}/README.md

@@ -25,20 +25,21 @@ pip3 install nercone-modern
 ## Usage
 
 ```python
-from nercone_modern import NerconeModern
+from nercone_modern.logging import ModernLogging
+from nercone_modern.progressbar import ModernProgressBar
 ```
 
 ### Logging
 
 ```python
-logger = NerconeModern().modernLogging(process_name="Main")
+logger = ModernLogging("Main", display_level="DEBUG")
 logger.log("This is a test message", level="INFO")
 ```
 
 ### Progress Bar
 
 ```python
-progress_bar = NerconeModern().modernProgressBar(total=100, process_name="Task 1", process_color=32, spinner_mode=True)
+progress_bar = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=True)
 progress_bar.start()
 
 time.sleep(5)

{nercone_modern-1.1.0 → nercone_modern-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "nercone-modern"
-version = "1.1.0"
+version = "1.2.0"
 description = "Modern Logging and Progress Bar Library"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

nercone_modern-1.2.0/src/nercone_modern/__init__.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# __init__.py on nercone-modern                                   #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
+from .logging import ModernLogging
+from .progressbar import ModernProgressBar

nercone_modern-1.2.0/src/nercone_modern/__main__.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# __main__.py on nercone-modern                                   #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
+import time
+from nercone_modern.logging import ModernLogging
+from nercone_modern.progressbar import ModernProgressBar
+
+logger1 = ModernLogging("Main", display_level="DEBUG")
+logger2 = ModernLogging("Sub", display_level="DEBUG")
+
+try:
+    logger1.log("This is a debug message", "DEBUG")
+    logger1.log("This is a info message", "INFO")
+    logger1.log("This is a info message", "INFO")
+    logger1.log("This is a info message", "INFO")
+    logger2.log("This is an error message", "INFO")
+    logger1.log("This is a warning message", "WARNING")
+    logger1.log("This is an error message", "ERROR")
+    logger1.log("This is an critical error message", "CRITICAL")
+    prompt_result = logger1.prompt("This is an Prompt. Let's try it: ")
+    logger1.log(f"Answer is: {prompt_result}", "INFO")
+
+    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.start()
+    progress_bar2.start()
+
+    progress_bar1.setMessage("RUNNING")
+    for i in range(100):
+        time.sleep(0.05)
+        progress_bar1.update()
+    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.finish()
+except KeyboardInterrupt:
+    print()
+    logger1.log("Aborted.", "INFO")

nercone_modern-1.2.0/src/nercone_modern/logging.py

@@ -0,0 +1,144 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# logging.py on nercone-modern                                    #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
+ModernLoggingLevels = ["DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"]
+MAX_LOG_LEVEL_WIDTH = max(len(level) for level in ModernLoggingLevels)
+LEVEL_ALIASES = {
+    "D": "DEBUG",
+    "DEBUG": "DEBUG",
+    "I": "INFO",
+    "INFO": "INFO",
+    "INFORMATION": "INFO",
+    "W": "WARN",
+    "WARN": "WARN",
+    "WARNING": "WARN",
+    "E": "ERROR",
+    "ERROR": "ERROR",
+    "C": "CRITICAL",
+    "CRITICAL": "CRITICAL"
+}
+
+_last_process = None
+_last_level = None
+_max_proc_width = 0
+
+def normalize_level(level: str) -> str:
+    level = level.strip().upper()
+    return LEVEL_ALIASES.get(level, level)
+
+def is_higher_priority(level_a: str, level_b: str) -> bool:
+    a = normalize_level(level_a)
+    b = normalize_level(level_b)
+    try:
+        return ModernLoggingLevels.index(a) >= ModernLoggingLevels.index(b)
+    except ValueError:
+        raise ValueError(f"Unknown log level: {level_a} or {level_b}")
+
+class ModernLogging:
+    def __init__(self, process_name: str, display_level: str = "INFO"):
+        self.process_name = process_name
+        self.display_level = display_level
+
+        global _max_proc_width
+        _max_proc_width = max(_max_proc_width, len(process_name))
+
+    def log(self, message="", level="INFO"):
+        if not is_higher_priority(level, self.display_level):
+            return
+
+        global _last_process, _last_level
+        level_text = normalize_level(level.strip().upper())
+        show_proc = (self.process_name != _last_process)
+        show_level = show_proc or (level_text != _last_level)
+
+        if level_text == "DEBUG":
+            color = 'gray'
+        elif level_text == "INFO":
+            color = 'blue'
+        elif level_text == "WARN":
+            color = 'yellow'
+        elif level_text == "ERROR":
+            color = 'red'
+        elif level_text == "CRITICAL":
+            color = 'red'
+        else:
+            color = 'blue'
+
+        print(self._make(message, level_text, color, show_proc, show_level))
+
+        _last_process = self.process_name
+        _last_level = level_text
+
+    def prompt(self, message="", level="INFO") -> str:
+        if not is_higher_priority(level, self.display_level):
+            return
+
+        global _last_process, _last_level
+        level_text = normalize_level(level.strip().upper())
+        show_proc = (self.process_name != _last_process)
+        show_level = show_proc or (level_text != _last_level)
+
+        if level_text == "DEBUG":
+            color = 'gray'
+        elif level_text == "INFO":
+            color = 'blue'
+        elif level_text == "WARN":
+            color = 'yellow'
+        elif level_text == "ERROR":
+            color = 'red'
+        elif level_text == "CRITICAL":
+            color = 'red'
+        else:
+            color = 'blue'
+
+        print(self._make(message, level_text, color, show_proc, show_level), end="")
+
+        _last_process = self.process_name
+        _last_level = level_text
+        return input()
+
+    def _make(self, message, level_text, color, show_proc, show_level):
+        global _max_proc_width
+        level_width = max(MAX_LOG_LEVEL_WIDTH, len(level_text))
+
+        proc_part = self.process_name if show_proc else ""
+        proc_part = proc_part.ljust(_max_proc_width) if proc_part else " " * _max_proc_width
+
+        if show_level:
+            level_part = f"{self._color(color)}{level_text.ljust(level_width)} |{self._color('reset')}"
+        else:
+            level_part = (" " * level_width) + f"{self._color(color)} |{self._color('reset')}"
+
+        return f"{proc_part} {level_part} {str(message)}"
+
+    def _color(self, color_name):
+        if color_name == "cyan":
+            return self._color_by_code(36)
+        elif color_name == "magenta":
+            return self._color_by_code(35)
+        elif color_name == "yellow":
+            return self._color_by_code(33)
+        elif color_name == "green":
+            return self._color_by_code(32)
+        elif color_name == "red":
+            return self._color_by_code(31)
+        elif color_name == "blue":
+            return self._color_by_code(34)
+        elif color_name == "white":
+            return self._color_by_code(37)
+        elif color_name == "black":
+            return self._color_by_code(30)
+        elif color_name in ("gray", "grey"):
+            return self._color_by_code(90)
+        elif color_name == "reset":
+            return self._color_by_code(0)
+        else:
+            return ""
+
+    def _color_by_code(self, color_code):
+        return f"\033[{color_code}m"

{nercone_modern-1.1.0 → nercone_modern-1.2.0}/src/nercone_modern/progressbar.py

@@ -1,18 +1,24 @@
+#!/usr/bin/env python3
+
+# -- nercone-modern --------------------------------------------- #
+# progressbar.py on nercone-modern                                #
+# Made by DiamondGotCat, Licensed under MIT License               #
+# Copyright (c) 2025 DiamondGotCat                                #
+# ---------------------------------------------- DiamondGotCat -- #
+
 import sys
 import threading
-import time
 
 class ModernProgressBar:
     _active_bars = []
     _last_rendered = False
     _lock = threading.RLock()
 
-    def __init__(self, total, process_name, process_color, spinner_mode=True):
+    def __init__(self, total: int, process_name: str, spinner_mode=True):
         self.total = total
         self.spinner_mode = spinner_mode
         self.current = 0
         self.process_name = process_name.strip()
-        self.process_color = process_color
         self.index = len(ModernProgressBar._active_bars)
         ModernProgressBar._active_bars.append(self)
         self.log_lines = 0
@@ -81,7 +87,7 @@ class ModernProgressBar:
             self.log_lines = 0
             if modernLogging is None:
                 modernLogging = self.makeModernLogging(self.process_name)
-            result = modernLogging._make(message, level, self.process_color)
+            result = modernLogging._make(message, level)
             if self.log_lines > 0:
                 move_up = self.log_lines
             else:
@@ -126,7 +132,7 @@ class ModernProgressBar:
                 status = "(RUNN)"
             else:
                 status = f"({self.current:>{total_width}}/{self.total})"
-            line = f"({self._color(self.process_color)}{bar}{self._color('reset')}) {self.process_name} - {'....' if self.spinner_mode else percentage} {status} | {self.message}"
+            line = f"({self._color('reset')}{bar}{self._color('reset')}) {self.process_name} - {'....' if self.spinner_mode else percentage} {status} | {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")

nercone_modern-1.1.0/src/nercone_modern/__init__.py

@@ -1,17 +0,0 @@
-import sys
-
-class NerconeModern:
-    def __init__(self):
-        pass
-
-    def color(self, color_code):
-        return f"\033[{color_code}m"
-    
-    def modernLogging(self, process_name):
-        from .logging import ModernLogging
-        return logging(process_name)
-    
-    def modernProgressBar(self, total: int, process_name: str, process_color: int = 32, spinner_mode: bool = False):
-        from .progressbar import ModernProgressBar
-        return progressbar(total, process_name, process_color, spinner_mode)
-

nercone_modern-1.1.0/src/nercone_modern/__main__.py

@@ -1,34 +0,0 @@
-from nercone_modern import NerconeModern
-
-if __name__ == "__main__":
-    import time
-
-    logger = NerconeModern().modernLogging("Main")
-    logger.log("This is a debug message", "DEBUG")
-    logger.log("This is a test message", "INFO")
-    logger.log("This is a warning message", "WARNING")
-    logger.log("This is an error message", "ERROR")
-    logger.log("This is an error message", "CRITICAL")
-
-    progress_bar1 = NerconeModern().modernProgressBar(total=100, process_name="Task 1", process_color=32, spinner_mode=False)
-    progress_bar1.setMessage("WAITING")
-    progress_bar2 = NerconeModern().modernProgressBar(total=200, process_name="Task 2", process_color=34, spinner_mode=True)
-    progress_bar2.setMessage("WAITING")
-
-    progress_bar1.start()
-    progress_bar2.start()
-
-    progress_bar1.setMessage("RUNNING")
-    for i in range(100):
-        time.sleep(0.05)
-        progress_bar1.update()
-    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.finish()

nercone_modern-1.1.0/src/nercone_modern/logging.py

@@ -1,30 +0,0 @@
-import sys
-
-ModernLoggingLevels = ["DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"]
-MAX_LOG_LEVEL_WIDTH = max(len(level) for level in ModernLoggingLevels)
-
-class ModernLogging:
-    def __init__(self, process_name):
-        self.process_name = process_name
-
-    def log(self, message, level="INFO"):
-        level_text = level.strip().upper()
-        if level_text in ["D", "DEBUG"]:
-            print(self._make(message, level="DEBUG", color=35))
-        elif level_text in ["I", "INFO", "INFORMATION"]:
-            print(self._make(message, level="INFO", color=34))
-        elif level_text in ["W", "WARN", "WARNING"]:
-            print(self._make(message, level="WARN", color=33))
-        elif level_text in ["E", "ERROR"]:
-            print(self._make(message, level="ERROR", color=31))
-        elif level_text in ["C", "CRITICAL"]:
-            print(self._make(message, level="CRITICAL", color=31))
-        else:
-            print(self._make(message, level=level, color=34))
-
-    def _make(self, message, level="INFO", color=34):
-        padded_level = level.ljust(max(MAX_LOG_LEVEL_WIDTH, len(level)))
-        return f"{self.process_name} {self._color(color)}{padded_level} | {self._color(0)}{message}"
-
-    def _color(self, color_code):
-        return f"\033[{color_code}m"