pyallel 1.2.1__tar.gz → 1.2.3__tar.gz

{pyallel-1.2.1 → pyallel-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 1.2.1
+Version: 1.2.3
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT
@@ -141,9 +141,6 @@ python -m venv .venv && \
 - [x] Add support to have commands depend on other commands (some commands must complete
       before a given command can start)
 - [ ] Add a debug mode that logs debug information to a log file
-- [ ] Fix wrapping of long commands in the command status line
-- [ ] Fix wrapping of very long lines in command output that pushes other commands off the
-      screen
 - [ ] Add support to state how many lines a command can use for it's output in interactive mode
 - [ ] Maybe add support to allow the user to provide stdin for commands that request it
       (such as a REPL)

{pyallel-1.2.1 → pyallel-1.2.3}/README.md

@@ -119,9 +119,6 @@ python -m venv .venv && \
 - [x] Add support to have commands depend on other commands (some commands must complete
       before a given command can start)
 - [ ] Add a debug mode that logs debug information to a log file
-- [ ] Fix wrapping of long commands in the command status line
-- [ ] Fix wrapping of very long lines in command output that pushes other commands off the
-      screen
 - [ ] Add support to state how many lines a command can use for it's output in interactive mode
 - [ ] Maybe add support to allow the user to provide stdin for commands that request it
       (such as a REPL)

{pyallel-1.2.1 → pyallel-1.2.3}/pyproject.toml

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

{pyallel-1.2.1 → pyallel-1.2.3}/src/pyallel/process_group.py

@@ -16,7 +16,13 @@ def get_num_lines(output: str, columns: int | None = None) -> int:
     for line in output.splitlines():
         line = constants.ANSI_ESCAPE.sub("", line)
         length = len(line)
-        lines += 1 * (length // columns + 1 if length > columns else 1)
+        line_lines = 1
+        if length > columns:
+            line_lines = length // columns
+            remainder = length % columns
+            if remainder:
+                line_lines += 1
+        lines += 1 * line_lines
     return lines
 
 
@@ -260,40 +266,55 @@ class ProcessGroup:
 
         output = ""
         for i, process in enumerate(self.processes, start=1):
+            process_output = ""
             if process.poll() is not None:
                 self.completed_processes.add(process.id)
                 if process.return_code() != 0:
                     self.passed = False
-                output += self._get_command_status(
+                process_output += self._get_command_status(
                     process,
                     passed=process.return_code() == 0,
                     timer=self.timer,
                 )
-                output += "\n"
+                process_output += "\n"
             else:
-                output += self._get_command_status(
+                process_output += self._get_command_status(
                     process,
                     icon=constants.ICONS[self.icon],
                     timer=self.timer,
                 )
-                output += "\n"
+                process_output += "\n"
 
-            process_output = process.read().decode()
+            command_lines = get_num_lines(process_output)
+            p_output = process.read().decode()
             if not self.output[process.id]:
                 self.output[process.id].append("")
-            self.output[process.id][0] += process_output
-            process_output = self.output[process.id][0]
-            if process_output:
+            self.output[process.id][0] += p_output
+            p_output = self.output[process.id][0]
+            p_output_lines = 0
+            if p_output:
                 if not all:
-                    process_output = "\n".join(
-                        process_output.splitlines()[-self.process_lines[i - 1] :]
-                    )
-                    process_output += "\n"
-                output += self._prefix(process_output)
-                if output and output[-1] != "\n":
-                    output += "\n"
+                    p_output_lines = p_output.splitlines()[-self.process_lines[i - 1] :]
+                    p_output = ""
+                    for line in p_output_lines:
+                        if len(line) + 3 > constants.COLUMNS():
+                            p_output += f"{''.join(line[:constants.COLUMNS()-3])}\n"
+                        else:
+                            p_output += line + "\n"
+                p_output = self._prefix(p_output)
+                if p_output and p_output[-1] != "\n":
+                    p_output += "\n"
                 if i != num_processes:
-                    output += "\n"
+                    p_output += "\n"
+                p_output_lines = get_num_lines(p_output)
+
+            if not all and (command_lines + p_output_lines) > self.process_lines[i - 1]:
+                truncate = (command_lines + p_output_lines) - self.process_lines[i - 1]
+                p_output = "\n".join(p_output.splitlines()[truncate:])
+                p_output += "\n"
+
+            process_output += p_output
+            output += process_output
 
         if self.interrupt_count == 0:
             return output