Fix queue waiting (#419)

chidiwilliams · Apr 26, 2023 · bf76627 · bf76627
1 parent 84ab53d
commit bf76627
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -180,6 +180,7 @@ jobs:
 
   benchmark:
     runs-on: ${{ matrix.os }}
+    if: github.ref == 'refs/heads/master'
     strategy:
       fail-fast: false
       matrix:

diff --git a/buzz/transcriber.py b/buzz/transcriber.py
@@ -711,24 +711,20 @@ def __init__(self, parent: Optional[QObject] = None):
     def run(self):
         logging.debug('Waiting for next transcription task')
 
-        # Waiting for new tasks in a loop instead of with queue.wait()
-        # resolves a "No Python frame" crash when the thread is quit.
+        # Get next non-canceled task from queue
         while True:
-            try:
-                self.current_task: Optional[FileTranscriptionTask] = self.tasks_queue.get_nowait()
-
-                # Stop listening when a "None" task is received
-                if self.current_task is None:
-                    self.completed.emit()
-                    return
+            self.current_task: Optional[FileTranscriptionTask] = self.tasks_queue.get()
 
-                if self.current_task.id in self.canceled_tasks:
-                    continue
+            # Stop listening when a "None" task is received
+            if self.current_task is None:
+                self.completed.emit()
+                return
 
-                break
-            except queue.Empty:
+            if self.current_task.id in self.canceled_tasks:
                 continue
 
+            break
+
         logging.debug('Starting next transcription task')
 
         model_type = self.current_task.transcription_options.model.model_type

diff --git a/tests/gui_test.py b/tests/gui_test.py
@@ -147,7 +147,7 @@ def test_should_set_window_title_and_icon(self, qtbot):
         assert window.windowIcon().pixmap(QSize(64, 64)).isNull() is False
         window.close()
 
-    @pytest.mark.skip(reason='Timing out or crashing')
+    # @pytest.mark.skip(reason='Timing out or crashing')
     def test_should_run_transcription_task(self, qtbot: QtBot, tasks_cache):
         window = MainWindow(tasks_cache=tasks_cache)
         qtbot.add_widget(window)
@@ -163,7 +163,7 @@ def test_should_run_transcription_task(self, qtbot: QtBot, tasks_cache):
         table_widget.setCurrentIndex(table_widget.indexFromItem(table_widget.item(0, 1)))
         assert open_transcript_action.isEnabled()
 
-    @pytest.mark.skip(reason='Timing out or crashing')
+    # @pytest.mark.skip(reason='Timing out or crashing')
     def test_should_run_and_cancel_transcription_task(self, qtbot, tasks_cache):
         window = MainWindow(tasks_cache=tasks_cache)
         qtbot.add_widget(window)