pyallel 1.3.0__tar.gz → 1.3.2__tar.gz

{pyallel-1.3.0 → pyallel-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 1.3.0
+Version: 1.3.2
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT
@@ -66,7 +66,7 @@ positional arguments:
                         --------------
                         commands can be grouped using the group separator symbol (:::)
 
-                             %(prog)s "echo boil kettle" "sleep 1" ::: "echo make coffee"
+                             pyallel "echo boil kettle" "sleep 1" ::: "echo make coffee"
 
                         the above will print "boil kettle" and sleep for 1 second first before printing "make coffee"
 
@@ -79,8 +79,8 @@ positional arguments:
 
                         lines (only used in interactive mode):
                             the lines modifier allows you to specify how many lines the command output can take up on the screen
-        
-                                %(prog)s "lines=90 :: echo running long command..." "echo running other command..."
+
+                                pyallel "lines=90 :: echo running long command..." "echo running other command..."
 
                             90 is expressed as a percentage value, which must be between 1 and 100 inclusive
 

{pyallel-1.3.0 → pyallel-1.3.2}/README.md

@@ -42,7 +42,7 @@ positional arguments:
                         --------------
                         commands can be grouped using the group separator symbol (:::)
 
-                             %(prog)s "echo boil kettle" "sleep 1" ::: "echo make coffee"
+                             pyallel "echo boil kettle" "sleep 1" ::: "echo make coffee"
 
                         the above will print "boil kettle" and sleep for 1 second first before printing "make coffee"
 
@@ -55,8 +55,8 @@ positional arguments:
 
                         lines (only used in interactive mode):
                             the lines modifier allows you to specify how many lines the command output can take up on the screen
-        
-                                %(prog)s "lines=90 :: echo running long command..." "echo running other command..."
+
+                                pyallel "lines=90 :: echo running long command..." "echo running other command..."
 
                             90 is expressed as a percentage value, which must be between 1 and 100 inclusive
 

{pyallel-1.3.0 → pyallel-1.3.2}/pyproject.toml

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

{pyallel-1.3.0 → pyallel-1.3.2}/src/pyallel/main.py

@@ -35,7 +35,7 @@ def run_interactive(
             if poll > 0:
                 return poll
 
-            printer.clear()
+            printer.reset()
             process_group_manager.run()
             if not process_group_manager.next():
                 return 0

{pyallel-1.3.0 → pyallel-1.3.2}/src/pyallel/printer.py

@@ -243,9 +243,9 @@ class Printer:
                     end="",
                 )
 
-        self.clear()
+        self.reset()
 
-    def clear(self) -> None:
+    def reset(self) -> None:
         self._printed.clear()
 
 
@@ -259,32 +259,52 @@ def set_process_lines(
         lines -= 2
 
     # Allocate lines to processes that have a fixed percentage of lines set
+    allocated_process_lines = lines // len(output.processes)
+    processes_with_dynamic_lines: list[ProcessOutput] = []
     used_lines = 0
-    other_processes: list[ProcessOutput] = []
-    for out in output.processes:
-        if not out.process.percentage_lines:
-            other_processes.append(out)
+    for process_output in output.processes:
+        # This process output doesn't have percentage_lines set, so skip it
+        if not process_output.process.percentage_lines:
+            processes_with_dynamic_lines.append(process_output)
             continue
 
-        out.process.lines = int(lines * out.process.percentage_lines)
-        used_lines += out.process.lines
+        process_output.process.lines = int(
+            lines * process_output.process.percentage_lines
+        )
+        used_lines += process_output.process.lines
 
+    # Remove the used lines from the total available lines
     lines -= used_lines
 
-    # Allocate the rest of the available lines to the other processes that don't have fixed lines set
-    num_dynamic_processes = len(other_processes)
-    if num_dynamic_processes:
-        remainder = lines % num_dynamic_processes
-        tail = lines // num_dynamic_processes
-
-        for out in other_processes:
-            out.process.lines = tail
-
-        # If we have lines left to allocate, we give all of them to the last process
-        if remainder:
-            for out in other_processes[-1::-1]:
-                out.process.lines += remainder
-                break
+    while lines:
+        # Calculate how many lines each process should have based on how many processes and lines are left
+        num_processes = len(processes_with_dynamic_lines) or 1
+        allocated_process_lines = lines // num_processes
+        processes_with_excess_output: list[ProcessOutput] = []
+        recalculate_lines = False
+        for process_output in processes_with_dynamic_lines:
+            # If the number of lines in this process output is less than how many terminal lines we would allocate it,
+            # Set it's allocated terminal lines to the exact number of lines in its output and remove this number from
+            # the total available terminal lines
+            if process_output.lines < allocated_process_lines:
+                process_output.process.lines = process_output.lines
+                lines -= process_output.process.lines
+                recalculate_lines = True
+                continue
+
+            processes_with_excess_output.append(process_output)
+
+        # We need to re-calcuate how many terminal lines we can allocate to each process if the output of at least one process
+        # contains less lines than what we would normally allocate it. This is done so we can allocate these extra lines to the
+        # other processes that contain more lines of output.
+        if recalculate_lines:
+            processes_with_dynamic_lines = processes_with_excess_output
+        else:
+            # All remaining processes exceed the number of terminal lines we will allocate them, so allocate them
+            # their terminal lines as normal and break out of the while loop
+            for process_output in processes_with_excess_output:
+                process_output.process.lines = allocated_process_lines
+            break
 
 
 def get_num_lines(line: str, columns: int | None = None) -> int:

{pyallel-1.3.0 → pyallel-1.3.2}/src/pyallel/process.py

@@ -13,10 +13,12 @@ class ProcessOutput:
     def __init__(self, id: int, process: Process, data: str = "") -> None:
         self.id = id
         self.data = data
+        self.lines = len(data.splitlines()) + 1
         self.process = process
 
     def merge(self, other: ProcessOutput) -> None:
         self.data += other.data
+        self.lines += len(other.data.splitlines())
 
 
 class Process:
@@ -82,7 +84,7 @@ class Process:
 
         args, *parts = cmd
 
-        percentage_lines = 0.0
+        percentage_lines = 0
         for arg in args.split(" "):
             try:
                 arg, value = args.split("=")
@@ -91,17 +93,17 @@ class Process:
 
             if arg == "lines":
                 try:
-                    percentage_lines = int(value) / 100
+                    percentage_lines = int(value)
                 except ValueError:
                     raise InvalidLinesModifierError(
                         "lines modifier must be a number between 1 and 100"
                     )
 
-                if not 0.0 < percentage_lines <= 1.0:
+                if not 0 < percentage_lines <= 100:
                     raise InvalidLinesModifierError(
                         "lines modifier must be a number between 1 and 100"
                     )
 
                 break
 
-        return cls(id, " ".join(parts), percentage_lines)
+        return cls(id, " ".join(parts), round(percentage_lines / 100, 2))

{pyallel-1.3.0 → pyallel-1.3.2}/src/pyallel/process_group.py

@@ -72,7 +72,7 @@ class ProcessGroup:
             percentage_lines_sum += process.percentage_lines
             processes.append(process)
 
-        if percentage_lines_sum > 1.0:
+        if round(percentage_lines_sum, 2) > 1.0:
             raise InvalidLinesModifierError(
                 "lines modifier must not exceed 100 across all processes within each process group"
             )