optimize painter

faissaloux · Jul 3, 2024 · ca34b80 · ca34b80
1 parent bbc6db8
commit ca34b80
Show file tree

Hide file tree

Showing 18 changed files with 558 additions and 571 deletions.
diff --git a/termspark/painter/constants/color.py b/termspark/painter/constants/color.py
diff --git a/termspark/painter/constants/fore.py b/termspark/painter/constants/fore.py
@@ -4,5 +4,4 @@
 
 
 class Fore(Color):
-    PREFIX: Final[str] = "\x1b[38;5;"
-    RGB_PREFIX: Final[str] = "\x1b[38;2;"
+    PREFIX: Final[str] = "\x1b[38;2;"
diff --git a/termspark/painter/constants/highlight.py b/termspark/painter/constants/highlight.py
@@ -4,5 +4,4 @@
 
 
 class Highlight(Color):
-    PREFIX: Final[str] = "\x1b[48;5;"
-    RGB_PREFIX: Final[str] = "\x1b[48;2;"
+    PREFIX: Final[str] = "\x1b[48;2;"
diff --git a/termspark/painter/painter.py b/termspark/painter/painter.py
@@ -11,11 +11,11 @@ class Painter:
     RESET: Final[str] = "\x1b[0m"
 
     def __paint(self, color: str, type: Type[Color]) -> str:
-        if color and self.__is_rgb(color):
-            return f"{type.RGB_PREFIX}{color.replace(',', ';')}{self.SUFFIX}"
+        if hasattr(type, color.upper()):
+            color = getattr(type, color.upper())
 
-        if color and hasattr(type, color.upper()):
-            return f"{type.PREFIX}{getattr(type, color.upper())}{self.SUFFIX}"
+        if color and self.__is_rgb(color):
+            return f"{type.PREFIX}{color.replace(',', ';')}{self.SUFFIX}"
 
         return ""