X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=text_utils.py;h=94df3e3499756a86955ebc3ee7330e5329720255;hb=36fea7f15ed17150691b5b3ead75450e575229ef;hp=9a9eb54702b25783abdc8100124b173790c00c5b;hpb=b29be4f1750fd20bd2eada88e751dfae85817882;p=python_utils.git

diff --git a/text_utils.py b/text_utils.py
index 9a9eb54..94df3e3 100644
--- a/text_utils.py
+++ b/text_utils.py
@@ -23,10 +23,11 @@ def get_console_rows_columns() -> RowsColumns:
     """Returns the number of rows/columns on the current console."""
 
     from exec_utils import cmd_with_timeout
+
     try:
         rows, columns = cmd_with_timeout(
             "stty size",
-            timeout_seconds=5.0,
+            timeout_seconds=1.0,
         ).split()
     except Exception as e:
         logger.exception(e)
@@ -50,16 +51,13 @@ def progress_graph(
     ret = "\r" if redraw else "\n"
     bar = bar_graph(
         percent,
-        include_text = True,
-        width = width,
-        fgcolor = fgcolor,
-        left_end = left_end,
-        right_end = right_end)
-    print(
-        bar,
-        end=ret,
-        flush=True,
-        file=sys.stderr)
+        include_text=True,
+        width=width,
+        fgcolor=fgcolor,
+        left_end=left_end,
+        right_end=right_end,
+    )
+    print(bar, end=ret, flush=True, file=sys.stderr)
 
 
 def bar_graph(
@@ -94,13 +92,16 @@ def bar_graph(
         part_width = math.floor(remainder_width * 8)
         part_char = [" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"][part_width]
     return (
-        left_end +
-        fgcolor +
-        "█" * whole_width + part_char +
-        " " * (width - whole_width - 1) +
-        reset +
-        right_end + " " +
-        text)
+        left_end
+        + fgcolor
+        + "█" * whole_width
+        + part_char
+        + " " * (width - whole_width - 1)
+        + reset
+        + right_end
+        + " "
+        + text
+    )
 
 
 def distribute_strings(
@@ -128,6 +129,10 @@ def distribute_strings(
             string, width=subwidth, alignment=alignment, padding=padding
         )
         retval += string
+    while len(retval) > width:
+        retval = retval.replace('  ', ' ', 1)
+    while len(retval) < width:
+        retval = retval.replace(' ', '  ', 1)
     return retval
 
 
@@ -146,13 +151,14 @@ def justify_string_by_chunk(
     padding = padding[0]
     first, *rest, last = string.split()
     w = width - (len(first) + 1 + len(last) + 1)
-    retval = (
-        first + padding + distribute_strings(rest, width=w, padding=padding)
+    ret = (
+        first
+        + padding
+        + distribute_strings(rest, width=w, padding=padding)
+        + padding
+        + last
     )
-    while len(retval) + len(last) < width:
-        retval += padding
-    retval += last
-    return retval
+    return ret
 
 
 def justify_string(
@@ -178,11 +184,7 @@ def justify_string(
         elif alignment == "r":
             string = padding + string
         elif alignment == "j":
-            return justify_string_by_chunk(
-                string,
-                width=width,
-                padding=padding
-            )
+            return justify_string_by_chunk(string, width=width, padding=padding)
         elif alignment == "c":
             if len(string) % 2 == 0:
                 string += padding
@@ -252,11 +254,14 @@ class Indenter(object):
             with i:
                 i.print('1, 2, 3')
     """
-    def __init__(self,
-                 *,
-                 pad_prefix: Optional[str] = None,
-                 pad_char: str = ' ',
-                 pad_count: int = 4):
+
+    def __init__(
+        self,
+        *,
+        pad_prefix: Optional[str] = None,
+        pad_char: str = ' ',
+        pad_count: int = 4,
+    ):
         self.level = -1
         if pad_prefix is not None:
             self.pad_prefix = pad_prefix
@@ -275,6 +280,7 @@ class Indenter(object):
 
     def print(self, *arg, **kwargs):
         import string_utils
+
         text = string_utils.sprintf(*arg, **kwargs)
         print(self.pad_prefix + self.padding * self.level + text, end='')
 
@@ -288,7 +294,7 @@ def header(title: str, *, width: int = 80, color: str = ''):
 
     """
     w = width
-    w -= (len(title) + 4)
+    w -= len(title) + 4
     if w >= 4:
         left = 4 * '-'
         right = (w - 4) * '-'
@@ -303,4 +309,5 @@ def header(title: str, *, width: int = 80, color: str = ''):
 
 if __name__ == '__main__':
     import doctest
+
     doctest.testmod()