pyallel 0.18.1__tar.gz → 0.18.3__tar.gz

{pyallel-0.18.1 → pyallel-0.18.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 0.18.1
+Version: 0.18.3
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT

{pyallel-0.18.1 → pyallel-0.18.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyallel"
-version = "0.18.1"
+version = "0.18.3"
 description = "Run and handle the output of multiple executables in pyallel (as in parallel)"
 authors = ["Daniel Black <danielcrblack@gmail.com>"]
 license = "MIT"

{pyallel-0.18.1 → pyallel-0.18.3}/src/pyallel/constants.py

@@ -1,9 +1,11 @@
 import os
+import re
 import sys
 
 IN_TTY = sys.stdout.isatty()
 CLEAR_LINE = "\033[2K"
 UP_LINE = "\033[1F"
+ANSI_ESCAPE = re.compile(r"(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]")
 
 if IN_TTY:
 
@@ -23,6 +25,8 @@ else:
 
 
 ICONS = ("/", "-", "\\", "|")
+# ICONS = ("⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏")
+
 # Unicode character bytes to render different symbols in the terminal
 TICK = "\u2713"
 X = "\u2717"

{pyallel-0.18.1 → pyallel-0.18.3}/src/pyallel/process.py

@@ -21,8 +21,9 @@ def get_num_lines(output: str, columns: int | None = None) -> int:
     lines = 0
     columns = columns or constants.COLUMNS()
     for line in output.splitlines():
+        line = constants.ANSI_ESCAPE.sub("", line)
         length = len(line)
-        lines += 1 * (length % columns + 1 if length > columns else 1)
+        lines += 1 * (length // columns + 1 if length > columns else 1)
     return lines