tui-utilities 1.0.15__tar.gz → 1.0.17__tar.gz

{tui_utilities-1.0.15 → tui_utilities-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tui_utilities
-Version: 1.0.15
+Version: 1.0.17
 Summary: Personal-use console utilities library
 Author-email: Guido Iván Gross <grossguidoivan@gmail.com>
 License: MIT

{tui_utilities-1.0.15 → tui_utilities-1.0.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tui_utilities"
-version = "1.0.15"
+version = "1.0.17"
 description = "Personal-use console utilities library"
 readme = "README.md"
 license = {text = "MIT"}

{tui_utilities-1.0.15 → tui_utilities-1.0.17}/tui_utilities/console.py

@@ -2,13 +2,14 @@ from rich.console import Console, RenderableType
 from rich.text import Text
 from rich.align import Align
 from rich.padding import Padding
+from rich.protocol import is_renderable
 import os
 import readchar
 
 _console = Console()
 
 def _style(
-    text,
+    object,
     color = "#ffffff",
     bold = False,
     italic = False,
@@ -23,9 +24,9 @@ def _style(
     left_padding = None,
     plain_text = False
 ):
-    def apply_text_styles(text):
-        message = Text()
-        if isinstance(text, str):
+    def apply_text_styles(object):
+        styleable = Text()
+        if isinstance(object, str):
             style_parts = [color]
             if bold: style_parts.append("bold")
             if italic: style_parts.append("italic")
@@ -34,17 +35,17 @@ def _style(
             if reverse: style_parts.append("reverse")
             style = " ".join(style_parts)
             current_segment = ""
-            for character in text:
+            for character in object:
                 if character == " ":
                     if current_segment:
-                        message.append(current_segment, style = style)
+                        styleable.append(current_segment, style = style)
                         current_segment = ""
-                    message.append(" ")
+                    styleable.append(" ")
                 else: current_segment += character
-            if current_segment: message.append(current_segment, style=style)
-            return message
-        elif isinstance(text, list):
-            for segment, segment_style in text:
+            if current_segment: styleable.append(current_segment, style=style)
+            return styleable
+        elif isinstance(object, list):
+            for segment, segment_style in object:
                 style_parts = [segment_style.get("color", color)]
                 if segment_style.get("bold"): style_parts.append("bold")
                 if segment_style.get("italic"): style_parts.append("italic")
@@ -56,29 +57,35 @@ def _style(
                 for character in segment:
                     if character == " ":
                         if current_segment:
-                            message.append(current_segment, style = style)
+                            styleable.append(current_segment, style = style)
                             current_segment = ""
-                        message.append(" ")
+                        styleable.append(" ")
                     else: current_segment += character
-                if current_segment: message.append(current_segment, style = style)
-            return message
+                if current_segment: styleable.append(current_segment, style = style)
+            return styleable
     
-    def apply_alignment(message): return Align(message, alignment)
+    def apply_alignment(alignable): return Align(alignable, alignment)
     
-    def apply_padding(message):
+    def apply_padding(paddable):
         final_padding = (
             top_padding if top_padding is not None else padding,
             (right_padding if right_padding is not None else padding) * 2,
             bottom_padding if bottom_padding is not None else padding,
             (left_padding if left_padding is not None else padding) * 2
         )
-        return Padding(message, final_padding)
+        return Padding(paddable, final_padding)
     
-    message = apply_text_styles(text)
-    if plain_text: return message
-    message = apply_alignment(message)
-    message = apply_padding(message)
-    return message
+    if is_renderable(object):
+        aligned = apply_alignment(object)
+        padded = apply_padding(aligned)
+        return padded
+    elif plain_text:
+        styled = apply_text_styles(object)
+        return styled
+    styled = apply_text_styles(object)
+    aligned = apply_alignment(styled)
+    padded = apply_padding(aligned)
+    return padded
 
 def print(
     *objects,
@@ -104,7 +111,7 @@ def print(
         if isinstance(object, Text): renderables.append(object)
         elif isinstance(object, (str, list)):
             renderables.append(_style(
-                text = object,
+                object = object,
                 color = color,
                 bold = bold,
                 italic = italic,
@@ -119,10 +126,19 @@ def print(
                 left_padding = left_padding,
                 plain_text = plain_text
             ))
-        elif isinstance(object, RenderableType): renderables.append(object)
+        elif is_renderable(object):
+            renderables.append(_style(
+                object = object,
+                alignment = alignment,
+                padding = padding,
+                top_padding = top_padding,
+                right_padding = right_padding,
+                bottom_padding = bottom_padding,
+                left_padding = left_padding
+            ))
         else:
             renderables.append(_style(
-                text = str(object),
+                object = str(object),
                 color = color,
                 bold = bold,
                 italic = italic,
@@ -149,7 +165,7 @@ def input(
     reverse = False
 ):
     return _console.input(_style(
-        text = text,
+        object = text,
         color = color,
         bold = bold,
         italic = italic,

{tui_utilities-1.0.15 → tui_utilities-1.0.17}/tui_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tui_utilities
-Version: 1.0.15
+Version: 1.0.17
 Summary: Personal-use console utilities library
 Author-email: Guido Iván Gross <grossguidoivan@gmail.com>
 License: MIT