Merge pull request #5 from lagmoellertim/development

Multiple Bug Fixes

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='unsilence',
-    version='1.0.1',
+    version='1.0.2',
     install_requires=requirements,
     license='MIT License',
     author='Tim-Luca Lagmöller',

unsilence/command_line/EntryPoint.py

@@ -1,4 +1,3 @@
-import os
 import sys
 
 from rich.console import Console
@@ -8,6 +7,7 @@
 from unsilence.command_line.ChoiceDialog import choice_dialog
 from unsilence.command_line.ParseArguments import parse_arguments
 from unsilence.command_line.PrettyTimeEstimate import pretty_time_estimate
+from unsilence.command_line.TerminalSupport import repair_console
 
 
 def main():
@@ -16,14 +16,13 @@ def main():
     :return: None
     """
     try:
+        repair_console()
         run()
     except KeyboardInterrupt:
         print("\nInterrupted")
 
-    try:
-        sys.exit(0)
-    except SystemExit:
-        os._exit(0)
+    repair_console()
+    sys.exit(0)
 
 
 def run():
@@ -108,3 +107,4 @@ def handler(current_val, total):
         progress.stop()
 
     console.print("\n[green]Finished![/green] :tada:")
+    print()

unsilence/command_line/TerminalSupport.py

@@ -0,0 +1,6 @@
+import os
+
+
+def repair_console():
+    if os.name == "posix":
+        os.system("stty sane")

unsilence/lib/render_media/MediaRenderer.py

@@ -73,6 +73,7 @@ def render(self, input_file: Path, output_file: Path, intervals: Intervals, **kw
         task_queue = queue.Queue()
         thread_list = []
         completed_tasks = []
+        corrupted_intervals = []
 
         def handle_thread_completed_task(completed_task, corrupted):
             """
@@ -82,12 +83,17 @@ def handle_thread_completed_task(completed_task, corrupted):
             :return: None
             """
             func = kwargs.get("on_render_progress_update", None)
+
+            thread_lock.acquire()
+
             if not corrupted:
-                thread_lock.acquire()
                 completed_tasks.append(completed_task)
                 if func is not None:
                     func(len(completed_tasks), len(intervals.intervals))
-                thread_lock.release()
+            else:
+                corrupted_intervals.append(completed_task)
+
+            thread_lock.release()
 
         for i in range(kwargs.get("threads", 2)):
             thread = RenderIntervalThread(i, input_file, render_options, task_queue, thread_lock,
@@ -107,7 +113,7 @@ def handle_thread_completed_task(completed_task, corrupted):
             task_queue.put(task)
             thread_lock.release()
 
-        while not task_queue.empty() or len(completed_tasks) != len(intervals.intervals):
+        while len(completed_tasks) < (len(intervals.intervals) - len(corrupted_intervals)):
             time.sleep(0.5)
 
         for thread in thread_list: