Preformatted box that doesn't wrap the contents.

[python_utils.git] / text_utils.py

diff --git a/text_utils.py b/text_utils.py
index afe0f63dcf1f86674fc95ba9d8dcca26747b158c..b42661959021c42180986f1f4e6dbaa93592a516 100644 (file)
--- a/text_utils.py
+++ b/text_utils.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+# © Copyright 2021-2022, Scott Gasch
+
 """Utilities for dealing with "text"."""
 
 import contextlib
@@ -336,16 +338,21 @@ def header(
         width = get_console_rows_columns().columns
     if not align:
         align = 'left'
+    if not style:
+        style = 'ascii'
 
+    text_len = len(string_utils.strip_ansi_sequences(title))
     if align == 'left':
         left = 4
-        right = width - (left + len(string_utils.strip_ansi_sequences(title)) + 4)
+        right = width - (left + text_len + 4)
     elif align == 'right':
         right = 4
-        left = width - (right + len(string_utils.strip_ansi_sequences(title)) + 4)
+        left = width - (right + text_len + 4)
     else:
-        left = int((width - (len(string_utils.strip_ansi_sequences(title)) + 4)) / 2)
+        left = int((width - (text_len + 4)) / 2)
         right = left
+        while left + text_len + 4 + right < width:
+            right += 1
 
     if style == 'solid':
         line_char = '━'
@@ -364,6 +371,15 @@ def header(
 
 def box(
     title: Optional[str] = None, text: Optional[str] = None, *, width: int = 80, color: str = ''
+) -> str:
+    assert width > 4
+    if text is not None:
+        text = justify_text(text, width=width - 4, alignment='l')
+    return preformatted_box(title, text, width=width, color=color)
+
+
+def preformatted_box(
+    title: Optional[str] = None, text: Optional[str] = None, *, width=80, color: str = ''
 ) -> str:
     assert width > 4
     ret = ''
@@ -386,9 +402,9 @@ def box(
         )
         ret += color + '│' + ' ' * w + '│' + rset + '\n'
     if text is not None:
-        for line in justify_text(text, width=w - 2, alignment='l').split('\n'):
+        for line in text.split('\n'):
             tw = len(string_utils.strip_ansi_sequences(line))
-            assert tw < w
+            assert tw <= w
             ret += color + '│ ' + rset + line + ' ' * (w - tw - 2) + color + ' │' + rset + '\n'
     ret += color + '╰' + '─' * w + '╯' + rset + '\n'
     return ret