nercone-modern 1.11.3__py3-none-any.whl → 1.12.0__py3-none-any.whl

nercone_modern/color.py

@@ -6,41 +6,87 @@
 # Copyright (c) 2025 DiamondGotCat                                #
 # ---------------------------------------------- DiamondGotCat -- #
 
+from enum import Enum
+
 class ModernColor:
-    def color_by_code(color_code: int | str = 0):
+    def from_code(color_code: int | str = 0):
         return f"\033[{color_code}m"
 
-    def color(color_name: str = "reset"):
-        if color_name in ("reset", "default"):
-            return ModernColor.color_by_code(0)
-        elif color_name == "black":
-            return ModernColor.color_by_code(30)
-        elif color_name == "red":
-            return ModernColor.color_by_code(31)
-        elif color_name == "green":
-            return ModernColor.color_by_code(32)
-        elif color_name == "yellow":
-            return ModernColor.color_by_code(33)
-        elif color_name == "blue":
-            return ModernColor.color_by_code(34)
-        elif color_name == "magenta":
-            return ModernColor.color_by_code(35)
-        elif color_name == "cyan":
-            return ModernColor.color_by_code(36)
-        elif color_name == "white":
-            return ModernColor.color_by_code(37)
-        elif color_name in ("gray", "grey"):
-            return ModernColor.color_by_code(90)
-        else:
-            return ""
-
-    RESET = "\033[0m"
-    BLACK = "\033[30m"
-    RED = "\033[31m"
-    GREEN = "\033[32m"
-    YELLOW = "\033[33m"
-    BLUE = "\033[34m"
-    MAGENTA = "\033[35m"
-    CYAN = "\033[36m"
-    WHITE = "\033[37m"
-    GRAY = "\033[90m"
+    def from_name(name: str = "default", background: bool = False):
+        name = name.strip().lower()
+        if name in ("default", "reset"):
+            return ModernColor.from_code(0)
+        elif name == "bold":
+            return ModernColor.from_code(1)
+        elif name == "underline":
+            return ModernColor.from_code(4)
+        elif not background:
+            if name == "black":
+                return ModernColor.from_code(30)
+            elif name == "red":
+                return ModernColor.from_code(31)
+            elif name == "green":
+                return ModernColor.from_code(32)
+            elif name == "yellow":
+                return ModernColor.from_code(33)
+            elif name == "blue":
+                return ModernColor.from_code(34)
+            elif name == "magenta":
+                return ModernColor.from_code(35)
+            elif name == "cyan":
+                return ModernColor.from_code(36)
+            elif name == ("white", "bright_gray", "bright_gray", "light_gray", "light_gray"):
+                return ModernColor.from_code(37)
+            elif name in ("bright_black", "gray", "grey"):
+                return ModernColor.from_code(90)
+            elif name == "bright_red":
+                return ModernColor.from_code(91)
+            elif name == "bright_green":
+                return ModernColor.from_code(92)
+            elif name == "bright_yellow":
+                return ModernColor.from_code(93)
+            elif name == "bright_blue":
+                return ModernColor.from_code(94)
+            elif name == "bright_magenta":
+                return ModernColor.from_code(95)
+            elif name == "bright_cyan":
+                return ModernColor.from_code(96)
+            elif name == "bright_white":
+                return ModernColor.from_code(97)
+            else:
+                return ""
+        elif background:
+            if name == "black":
+                return ModernColor.from_code(40)
+            elif name == "red":
+                return ModernColor.from_code(41)
+            elif name == "green":
+                return ModernColor.from_code(42)
+            elif name == "yellow":
+                return ModernColor.from_code(43)
+            elif name == "blue":
+                return ModernColor.from_code(44)
+            elif name == "magenta":
+                return ModernColor.from_code(45)
+            elif name == "cyan":
+                return ModernColor.from_code(46)
+            elif name == ("white", "bright_gray", "bright_gray", "light_gray", "light_gray"):
+                return ModernColor.from_code(47)
+            elif name in ("bright_black", "gray", "grey"):
+                return ModernColor.from_code(100)
+            elif name == "bright_red":
+                return ModernColor.from_code(101)
+            elif name == "bright_green":
+                return ModernColor.from_code(102)
+            elif name == "bright_yellow":
+                return ModernColor.from_code(103)
+            elif name == "bright_blue":
+                return ModernColor.from_code(104)
+            elif name == "bright_magenta":
+                return ModernColor.from_code(105)
+            elif name == "bright_cyan":
+                return ModernColor.from_code(106)
+            elif name == "bright_white":
+                return ModernColor.from_code(107)
+            else:
+                return ""

nercone_modern/logging.py

@@ -8,7 +8,7 @@
 
 import sys
 from .color import ModernColor
-from ansi2text import Ansi2Text
+from strip_ansi import strip_ansi
 from datetime import datetime, timezone
 
 ModernLoggingLevels = ["DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"]
@@ -63,11 +63,11 @@ class ModernLogging:
         _last_level = normalize_level(level_text.strip().upper())
         if self.filepath:
             with open(self.filepath, "a") as f:
-                f.write(f"{Ansi2Text().convert(log_line)}\n")
+                f.write(f"{strip_ansi(log_line)}\n")
 
     def prompt(self, message: str = "", level_text: str = "INFO", level_color: str | None = None, default: str | None = None, show_default: bool = False, choices: list[str] | None = None, show_choices: bool = True, interrupt_ignore: bool = False, interrupt_default: str | None = None) -> str:
         if not is_higher_priority(level_text, self.display_level):
-            return
+            return ""
         global _last_process, _last_level
         if default and show_default:
             message += f" ({default})"
@@ -104,7 +104,7 @@ class ModernLogging:
             self._rewrite_prompt_line_with_answer(log_line, answer)
         if self.filepath:
             with open(self.filepath, "a") as f:
-                f.write(f"{Ansi2Text().convert(log_line)}{answer}\n")
+                f.write(f"{strip_ansi(log_line)}{answer}\n")
         if choices:
             selected = self._select_choice(answer, choices)
             if selected is not None:
@@ -115,7 +115,7 @@ class ModernLogging:
                     print(log_line)
                     if self.filepath:
                         with open(self.filepath, "a") as f:
-                            f.write(f"{Ansi2Text().convert(log_line)}{answer}\n")
+                            f.write(f"{strip_ansi(log_line)}{answer}\n")
                     log_line = self.make(message=message, level_text=level_text, level_color=level_color)
                     print(log_line, end="")
                     try:
@@ -142,7 +142,7 @@ class ModernLogging:
                         self._rewrite_prompt_line_with_answer(log_line, answer)
                     if self.filepath:
                         with open(self.filepath, "a") as f:
-                            f.write(f"{Ansi2Text().convert(log_line)}{answer}\n")
+                            f.write(f"{strip_ansi(log_line)}{answer}\n")
                     if answer.strip() == "" and default is not None:
                         if choices:
                             selected_default = self._select_choice(default, choices)
@@ -202,4 +202,4 @@ class ModernLogging:
         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}"
+        return f"[{timestamp} {ModernColor.from_name(level_color)}{log_level}{ModernColor.from_name('reset')} {proc_name}] {message}"

nercone_modern/progressbar.py

@@ -90,12 +90,12 @@ class ModernProgressBar:
         self._stop_spinner_thread()
         self._render(final=True, advance_spinner=False)
 
-    def log(self, message: str = "", level_text: str = "INFO", level_color: str | None = None, show_proc: bool | None = None, show_level: bool | None = None, modernLogging: ModernLogging = None):
+    def log(self, message: str = "", level_text: str = "INFO", level_color: str | None = None, show_proc: bool | None = None, show_level: bool | None = None, modernLogging: ModernLogging | None = None):
         with ModernProgressBar._lock:
             self.log_lines = 0
             if modernLogging is None:
                 modernLogging = ModernLogging(self.process_name)
-            result = modernLogging.make(message=message, level_text=level_text, level_color=level_color, show_proc=show_proc, show_level=show_level)
+            result = modernLogging.make(message=message, level_text=level_text, level_color=level_color)
             if self.log_lines > 0:
                 move_up = self.log_lines
             else:
@@ -150,7 +150,7 @@ class ModernProgressBar:
                     status = f" ({' ' * total_width}/{' ' * total_width})"
                 else:
                     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}"
+            line = f"{ModernColor.from_name(self.box_color)}{self.box_left}{ModernColor.from_name('reset')}{ModernColor.from_name('gray')}{bar}{ModernColor.from_name('reset')}{ModernColor.from_name(self.box_color)}{self.box_right}{ModernColor.from_name('reset')} {ModernColor.from_name(self.primary_color)}{proc_name}{ModernColor.from_name('reset')} {ModernColor.from_name(self.secondary_color)}{percentage_alt if self.spinner_mode else percentage}{ModernColor.from_name('reset')}{ModernColor.from_name('gray')}{status}{ModernColor.from_name('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")
@@ -163,7 +163,7 @@ class ModernProgressBar:
                 sys.stdout.write(f"\033[{down_lines}B")
             sys.stdout.flush()
 
-    def _progress_bar(self, progress: int, advance_spinner: bool = True):
+    def _progress_bar(self, progress: int | float, advance_spinner: bool = True):
         bar_length = logging._max_prefix_width - 3
         if not self._should_spin():
             if self.current == self.total:
@@ -171,18 +171,18 @@ class ModernProgressBar:
             else:
                 center_bar = self.centor_bar
             if self.current <= 0 and not self._spinner_ready:
-                return f"{ModernColor.color('gray')}{self.secondary_bar * (bar_length + 1)}"
+                return f"{ModernColor.from_name('gray')}{self.secondary_bar * (bar_length + 1)}"
             filled_length = int(progress * bar_length) + 1
-            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)}"
+            return f"{ModernColor.from_name(self.primary_color)}{self.primary_bar * filled_length}{ModernColor.from_name(self.third_color)}{center_bar}{ModernColor.from_name('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)}"
+                return f"{ModernColor.from_name('gray')}{'-' * (bar_length + 1)}"
             spinner_symbol_length = 1
             spinner_end_bar_length = bar_length - self.spinner_step
             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.third_color)}{'-' * spinner_symbol_length}{ModernColor.color('gray')}{'-' * spinner_end_bar_length}"
+            return f"{ModernColor.from_name('gray')}{'-' * spinner_start_bar_length}{ModernColor.from_name(self.third_color)}{'-' * spinner_symbol_length}{ModernColor.from_name('gray')}{'-' * spinner_end_bar_length}"
 
     def _should_spin(self):
         return self.spinner_mode and self._spinner_ready

nercone_modern/text.py

@@ -10,10 +10,10 @@ from typing import Union
 from .color import ModernColor
 
 class ModernText:
-    def __init__(self, content="", color: str = ModernColor.WHITE):
+    def __init__(self, content="", color: str = ModernColor.from_name("white")):
         self.content = content
         if not color.startswith("\033"):
-            color = getattr(ModernColor, color.upper(), ModernColor.WHITE)
+            color = getattr(ModernColor, color.upper(), ModernColor.from_name("white"))
         self.color = color
 
     def __add__(self, other: Union[str, "ModernText"]):
@@ -21,12 +21,12 @@ class ModernText:
             if self.color == other.color:
                 return ModernText(self.content + other.content, self.color)
             else:
-                combined = f"{self.color}{self.content}{ModernColor.RESET}{other.color}{other.content}"
-                return ModernText(combined, ModernColor.RESET)
+                combined = f"{self.color}{self.content}{ModernColor.from_name('reset')}{other.color}{other.content}"
+                return ModernText(combined, ModernColor.from_name("reset"))
         elif isinstance(other, str):
             return ModernText(self.content + other, self.color)
         else:
             raise TypeError(f"Unsupported operand type(s) for +: 'ModernText' and '{type(other).__name__}'")
 
     def __str__(self):
-        return f"{self.color}{self.content}{ModernColor.RESET}"
+        return f"{self.color}{self.content}{ModernColor.from_name('reset')}"

{nercone_modern-1.11.3.dist-info → nercone_modern-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.11.3
+Version: 1.12.0
 Summary: Modern CLI Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
@@ -8,7 +8,7 @@ License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Dist: ansi2text
+Requires-Dist: strip-ansi
 Requires-Python: >=3.6
 Project-URL: Homepage, https://github.com/DiamondGotCat/nercone-modern
 Description-Content-Type: text/markdown

nercone_modern-1.12.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
+nercone_modern/__main__.py,sha256=PbC8jASQJvSOUOW1m106Cei4kpJPFwxPcwxfPMjckUU,2083
+nercone_modern/color.py,sha256=2wsRoGkK9_pzrdAO4L7w4M8AksRJWHPpVHuEw9gS85Q,3897
+nercone_modern/logging.py,sha256=UyrGifwMXQxwxG0nBYjZb5yaYydW1j5I_deYRM6Lm7Q,8767
+nercone_modern/progressbar.py,sha256=SLniep8xpfLDkV_cjppmcY2PC30OcUudjUegum7mkD0,8847
+nercone_modern/text.py,sha256=tETYH4QHBtxurmSxdMS7ajA3K08vBoUP_amnRFYeKFw,1461
+nercone_modern-1.12.0.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
+nercone_modern-1.12.0.dist-info/METADATA,sha256=IkdS_531j0wyfjkynbzrWH_NOEMe-62NRplPhdORooU,6154
+nercone_modern-1.12.0.dist-info/RECORD,,

{nercone_modern-1.11.3.dist-info → nercone_modern-1.12.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.13
+Generator: uv 0.9.29
 Root-Is-Purelib: true
-Tag: py3-none-any
+Tag: py3-none-any

nercone_modern-1.11.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
-nercone_modern/__main__.py,sha256=PbC8jASQJvSOUOW1m106Cei4kpJPFwxPcwxfPMjckUU,2083
-nercone_modern/color.py,sha256=nWzIDKIvHeHX57wZT4YYXztKWLSShRqOTPzQa4L30qI,1646
-nercone_modern/logging.py,sha256=o8aVHFfg1BHN59HDOirZd3p9EJdovcLfjdWLSP-1rdM,8790
-nercone_modern/progressbar.py,sha256=VYohOwKyxTtyhNehG0O4zOtPt3wGvVxAelQ-ye8hg-k,8796
-nercone_modern/text.py,sha256=W1Wn_9E7O70AyuOVjb9GZqOdUoyqoHIyGPViBdgHShs,1396
-nercone_modern-1.11.3.dist-info/WHEEL,sha256=3id4o64OvRm9dUknh3mMJNcfoTRK08ua5cU6DFyVy-4,79
-nercone_modern-1.11.3.dist-info/METADATA,sha256=9DSRmQLI0pIbGJbd5f6favll6Vk1m3_EFE1gU0bOgBM,6153
-nercone_modern-1.11.3.dist-info/RECORD,,