pyallel 2.0.3__tar.gz → 2.0.4__tar.gz

{pyallel-2.0.3 → pyallel-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyallel
-Version: 2.0.3
+Version: 2.0.4
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 License: MIT
 License-File: LICENSE

{pyallel-2.0.3 → pyallel-2.0.4}/pyproject.toml

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

{pyallel-2.0.3 → pyallel-2.0.4}/src/pyallel/printer.py

@@ -41,7 +41,7 @@ class ConsolePrinter:
         columns = columns or constants.COLUMNS()
         if prefix:
             truncate_num = 6
-        if truncate:
+        if prefix and truncate:
             columns = columns - truncate_num
             if self.get_num_lines(line, columns) > 1:
                 line = self.truncate_line(line, columns)
@@ -108,8 +108,10 @@ class ConsolePrinter:
         output: ProcessOutput,
         include_progress: bool = True,
         include_timer: bool | None = None,
+        columns: int | None = None,
     ) -> str:
         include_timer = include_timer if include_timer is not None else self._timer
+        columns = columns or constants.COLUMNS()
 
         passed = None
         icon = ""
@@ -143,11 +145,11 @@ class ConsolePrinter:
             timer = f"({self.format_time_taken(elapsed)})"
 
         command = output.process.command
-        if self.get_num_lines(output.process.command) > 1:
-            columns = constants.COLUMNS() - (len(msg) + len(timer) + 9)
-            command = self.truncate_line(command, columns)
-
         out = f"{self._colours.white_bold}[{self._colours.reset_colour}{self._colours.blue_bold}{command}{self._colours.reset_colour}{self._colours.white_bold}]{self._colours.reset_colour}{colour} {msg} {icon}{self._colours.reset_colour}"
+        if self.get_num_lines(out, columns) > 1:
+            columns = columns - (len(msg) + len(timer) + 9)
+            command = self.truncate_line(command, columns)
+            out = f"{self._colours.white_bold}[{self._colours.reset_colour}{self._colours.blue_bold}{command}{self._colours.reset_colour}{self._colours.white_bold}]{self._colours.reset_colour}{colour} {msg} {icon}{self._colours.reset_colour}"
 
         if timer:
             out += f" {self._colours.dim_on}{timer}{self._colours.dim_off}"