ScriptCollection 3.5.74__py3-none-any.whl → 3.5.75__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -925,7 +925,7 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def retry_action(action, amount_of_attempts: int) -> None:
+    def retry_action(action, amount_of_attempts: int,action_name:str=None) -> None:
         amount_of_fails = 0
         enabled = True
         while enabled:
@@ -936,6 +936,10 @@ class GeneralUtilities:
                 amount_of_fails = amount_of_fails+1
                 GeneralUtilities.assert_condition(not (amount_of_attempts < amount_of_fails))
                 if amount_of_fails == amount_of_attempts:
+                    message=f"Action failed {amount_of_attempts} times."
+                    if action_name is not None:
+                        message=f"{message} Name of action: {action_name}"
+                    GeneralUtilities.write_exception_to_stderr(message)
                     raise
         return None
 

ScriptCollection/ScriptCollectionCore.py

@@ -32,7 +32,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.74"
+version = "3.5.75"
 __version__ = version
 
 
@@ -1344,12 +1344,6 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def __run_program_argsasarray_async_helper(self, program: str, arguments_as_array: list[str] = [], working_directory: str = None, verbosity: int = 1, print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, custom_argument: object = None, interactive: bool = False) -> Popen:
-        # Verbosity:
-        # 0=Quiet (No output will be printed.)
-        # 1=Normal (If the exitcode of the executed program is not 0 then the StdErr will be printed.)
-        # 2=Full (Prints StdOut and StdErr of the executed program.)
-        # 3=Verbose (Same as "Full" but with some more information.)
-
         if isinstance(self.program_runner, ProgramRunnerEpew):
             custom_argument = CustomEpewArgument(print_errors_as_information, log_file, timeoutInSeconds, addLogOverhead, title, log_namespace, verbosity, arguments_for_log)
         popen: Popen = self.program_runner.run_program_argsasarray_async_helper(program, arguments_as_array, working_directory, custom_argument, interactive)
@@ -1378,7 +1372,7 @@ class ScriptCollectionCore:
         return False
 
     @staticmethod
-    def __read_popen_pipes(p: Popen) -> tuple[list[str], list[str]]:
+    def __read_popen_pipes(p: Popen,print_live_output:bool,print_errors_as_information:bool) -> tuple[list[str], list[str]]:
         p_id = p.pid
         with ThreadPoolExecutor(2) as pool:
             q_stdout = Queue()
@@ -1393,18 +1387,30 @@ class ScriptCollectionCore:
             stderr_result: list[str] = []
 
             while (ScriptCollectionCore.__continue_process_reading(p_id, p, q_stdout, q_stderr, reading_stdout_last_time_resulted_in_exception, reading_stderr_last_time_resulted_in_exception)):
-
                 try:
                     while not q_stdout.empty():
-                        stdout_result.append(q_stdout.get_nowait())
+                        out_line:str=q_stdout.get_nowait()
+                        stdout_result.append(out_line)
                         reading_stdout_last_time_resulted_in_exception = False
+                        if print_live_output:
+                            print(out_line, end='\n', file=sys.stdout, flush=False)
+                    if print_live_output:
+                        sys.stdout.flush()
                 except Empty:
                     reading_stdout_last_time_resulted_in_exception = True
 
                 try:
                     while not q_stderr.empty():
-                        stderr_result.append(q_stderr.get_nowait())
+                        err_line:str=q_stderr.get_nowait()
+                        stderr_result.append(err_line)
                         reading_stderr_last_time_resulted_in_exception = False
+                        if print_live_output:
+                            print(err_line, end='\n', file=sys.stdout if print_errors_as_information else sys.stderr, flush=False)
+                    if print_live_output:
+                        if print_errors_as_information:
+                            sys.stdout.flush()
+                        else:
+                            sys.stderr.flush()
                 except Empty:
                     reading_stderr_last_time_resulted_in_exception = True
 
@@ -1452,7 +1458,7 @@ class ScriptCollectionCore:
                     GeneralUtilities.ensure_file_exists(log_file)
                 pid = process.pid
 
-                outputs: tuple[list[str], list[str]] = ScriptCollectionCore.__read_popen_pipes(process)
+                outputs: tuple[list[str], list[str]] = ScriptCollectionCore.__read_popen_pipes(process,print_live_output,print_errors_as_information)
 
                 for out_line_plain in outputs[0]:
                     if out_line_plain is not None:
@@ -1467,8 +1473,6 @@ class ScriptCollectionCore:
                         if out_line is not None and GeneralUtilities.string_has_content(out_line):
                             if out_line.endswith("\n"):
                                 out_line = out_line[:-1]
-                            if print_live_output:
-                                print(out_line, end='\n', file=sys.stdout,  flush=True)
                             if 0 < len(stdout):
                                 stdout = stdout+"\n"
                             stdout = stdout+out_line
@@ -1487,8 +1491,6 @@ class ScriptCollectionCore:
                         if err_line is not None and GeneralUtilities.string_has_content(err_line):
                             if err_line.endswith("\n"):
                                 err_line = err_line[:-1]
-                            if print_live_output:
-                                print(err_line, end='\n', file=sys.stdout if print_errors_as_information else sys.stderr,  flush=True)
                             if 0 < len(stderr):
                                 stderr = stderr+"\n"
                             stderr = stderr+err_line

{ScriptCollection-3.5.74.dist-info → ScriptCollection-3.5.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ScriptCollection
-Version: 3.5.74
+Version: 3.5.75
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{ScriptCollection-3.5.74.dist-info → ScriptCollection-3.5.75.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ScriptCollection/Executables.py,sha256=zxDRhv6UHzP0F9lFQvfPv8twy27BEA0-jIMvZfcZTb4,30016
-ScriptCollection/GeneralUtilities.py,sha256=WSBawT958x_0H-hnPg3S3DGzP3KOQTADtZtP145I-M4,39473
+ScriptCollection/GeneralUtilities.py,sha256=co7hYrwTHSqSSHukkRBNSnwSRD8t237wtO2vA0YkK4E,39766
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=LOm3hvX572Kbk7SL2FQSAvxUYBM2WezliFc6cI0PxEA,118614
+ScriptCollection/ScriptCollectionCore.py,sha256=87yRWzemamkISYs-CW5Zs5dniulAk9A5yLtUDkLaaxg,118788
 ScriptCollection/TasksForCommonProjectStructure.py,sha256=n3x4XRyjabsL0SuMGZz3LJiq5ctjz7mMAS77QoAJFP8,215347
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.74.dist-info/METADATA,sha256=tgYQrE5dKbrbv9Gz7_9pHYBhZlwFNuYo-iyDpCN-r14,7664
-ScriptCollection-3.5.74.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.74.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
-ScriptCollection-3.5.74.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.74.dist-info/RECORD,,
+ScriptCollection-3.5.75.dist-info/METADATA,sha256=6JiMoYzp7oM1cUYax-k5vff7q2cLW2_Xw4BeEMuvVto,7664
+ScriptCollection-3.5.75.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.75.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
+ScriptCollection-3.5.75.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.75.dist-info/RECORD,,