Port terminal colors preview to plain ANSI escape sequences

Removes need for optional colr module

Author: luisbocanegra

src/kde_material_you_colors/schemeconfigs.py

@@ -10,6 +10,7 @@
 )
 from .utils import math_utils
 from .utils import string_utils
+from .utils import color_utils
 
 
 class ThemeConfig:
@@ -25,7 +26,11 @@ def __init__(
     ):
         if custom_colors_list is not None:
             colors_best = custom_colors_list
-            logging.info(f"Using custom colors: {colors_best}")
+            colors_str = ""
+            for color in custom_colors_list:
+                rgb = color_utils.hex2rgb(color)
+                colors_str += f"\033[38;2;{rgb[0]};{rgb[1]};{rgb[2]};1m{color} \033[0m"
+            logging.info(f"Using custom colors: {colors_str}")
         else:
             colors_best = list(colors["best"].values())
         # colors_best = list(colors['best'].values())

src/kde_material_you_colors/settings.py

@@ -8,7 +8,6 @@
 from kde_material_you_colors.utils.utils import find_executable
 
 USERNAME = getpass.getuser()
-USER_HAS_COLR = importlib.util.find_spec("colr") is not None
 USER_HAS_PYWAL = importlib.util.find_spec("pywal") is not None
 HOME = str(Path.home())
 TEMPDIR = tempfile.gettempdir()

src/kde_material_you_colors/utils/m3_scheme_utils.py

@@ -1,9 +1,6 @@
 import logging
 import os
 from .. import settings
-
-if settings.USER_HAS_COLR:
-    import colr
 from . import color_utils
 from . import math_utils
 from . import notify
@@ -174,31 +171,26 @@ def get_color_schemes(wallpaper: WallpaperReader, ncolor=None):
                 if len(materialYouColors["best"]) > 1:
                     best_colors = f"Best colors: {settings.TERM_STY_BOLD}"
 
-                    for index, col in materialYouColors["best"].items():
-                        if settings.USER_HAS_COLR:
-                            best_colors += f"{settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{index}:{colr.color(col,fore=col)}"
-                        else:
-                            best_colors += f"{settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{index}:{settings.TERM_COLOR_WHI}{col}"
-                        if int(index) < len(materialYouColors["best"]) - 1:
-                            best_colors = best_colors + ","
+                    for i, color in materialYouColors["best"].items():
+                        rgb = color_utils.hex2rgb(color)
+                        preview = (
+                            f"\033[38;2;{rgb[0]};{rgb[1]};{rgb[2]};1m{color} \033[0m"
+                        )
+                        best_colors += f"{settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{i}:{preview}"
                     logging.info(best_colors)
 
                 seed = materialYouColors["seed"]
                 sedColor = list(seed.values())[0]
                 seedNo = list(seed.keys())[0]
-                if settings.USER_HAS_COLR:
-                    logging.info(
-                        f"Using seed: {settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{seedNo}:{colr.color(sedColor, fore=sedColor)}"
-                    )
-                else:
-                    logging.info(
-                        f"Using seed: {settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{seedNo}:{settings.TERM_COLOR_WHI}{sedColor}"
-                    )
-
+                rgb = color_utils.hex2rgb(sedColor)
+                preview = f"\033[38;2;{rgb[0]};{rgb[1]};{rgb[2]};1m{sedColor} \033[0m"
+                logging.info(
+                    f"Using seed: {settings.TERM_COLOR_DEF+settings.TERM_STY_BOLD}{seedNo}:{preview}"
+                )
                 return materialYouColors
 
             except Exception as e:
-                logging.error(f"Error:\n{e}")
+                logging.exception(f"Error:\n{e}")
                 return None
 
 

src/kde_material_you_colors/utils/pywal_utils.py

@@ -6,8 +6,6 @@
 if settings.USER_HAS_PYWAL:
     import pywal
     from . import pywal_sequences_timeout
-if settings.USER_HAS_COLR:
-    import colr
 
 
 def apply_schemes(
@@ -48,30 +46,32 @@ def apply_schemes(
             logging.warning(
                 "Pywal option enabled but python module is not installed, ignored"
             )
-    # print palette
-    print_color_palette(pywal_colors)
 
 
-def print_color_palette(pywal_colors):
-    if settings.USER_HAS_COLR:
-        i = 0
-        for index, col in pywal_colors["colors"].items():
-            if i % 8 == 0 and i != 0:
-                print()
-            print(f'{colr.color("    ",back=hex2rgb(col))}', end="")
-            i += 1
-        print(f"{settings.TERM_STY_RESET}")
+def print_color_palette(
+    light=None,
+    pywal_light=None,
+    schemes: ThemeConfig = None,
+    dark_light=None,
+):
+    if pywal_light is not None:
+        mode = pywal_light
+    elif light is not None:
+        mode = light
     else:
-        logging.debug(
-            "Install colr python module to tint color codes and palette as they update"
-        )
-        # Print color palette from pywal.colors.palette
-        for i in range(0, 16):
-            if i % 8 == 0 and i != 0:
-                print()
+        mode = dark_light
 
-            if i > 7:
-                i = "8;5;%s" % i
+    pywal_colors = (
+        schemes.get_wal_light_scheme() if mode else schemes.get_wal_dark_scheme()
+    )
 
-            print("\033[4%sm%s\033[0m" % (i, " " * (80 // 20)), end="")
-        print("\n", end="")
+    for i, (name, color) in enumerate(pywal_colors["colors"].items()):
+        i = int(i)
+        fg = "30"
+        if i == 0:
+            fg = "39"
+        if i % 8 == 0 and i != 0:
+            print()
+        rgb = hex2rgb(color)
+        print(f"\033[48;2;{rgb[0]};{rgb[1]};{rgb[2]};{fg}m {color} \033[0m", end="")
+    print(f"{settings.TERM_STY_RESET}")