Threaded every task with better progress bar handling to improve stability, various fixes

Author: robotmitchum

__init__.py

@@ -6,4 +6,4 @@
     :date: 2024.05
 """
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'

plt_cfg/YMM_plt_cfg.json

@@ -0,0 +1,36 @@
+{
+  "textColor": {
+    "0": "ffffffff"
+  },
+  "trackBackgroundColor": {
+    "0": "ffffffff"
+  },
+  "control": {
+    "expression": "ffeb3526",
+    "modulation": "ffeb3526",
+    "reverb": "ffeb3526"
+  },
+  "other": {
+    "ampVelTrack": "ffeb3526",
+    "release": "ffeb3526"
+  },
+  "backgroundRamp": {
+    "0": "fff3c43f",
+    "1": "ffe3b258",
+    "2": "fff3c43f"
+  },
+  "group": {
+    "0": "ffeb3526"
+  },
+  "muteButton": {
+    "0": "ffeb3526"
+  },
+  "backgroundText": {
+    "0": "ffffffff",
+    "1": "80ffffff"
+  },
+  "keyboard": {
+    "0": "fff3c43f",
+    "1": "ffffffff"
+  }
+}

tools/audio_player.py

@@ -14,41 +14,47 @@
 import soundfile as sf
 from common_ui_utils import resource_path
 
+from PyQt5.QtCore import QObject, pyqtSignal
+
+
+class AudioPlayerSignals(QObject):
+    message = pyqtSignal(str)
+
 
 class AudioPlayer:
     def __init__(self):
         self.is_playing = threading.Event()
         self.stream = None
+        self.signals = AudioPlayerSignals()
 
-    def play(self, data, sr, loop_start, loop_end, msg=None):
+    def play(self, data, sr, loop_start, loop_end):
         if not self.is_playing.is_set():
             callback = AudioCallback(data, loop_start, loop_end, player=self)
             self.stream = sd.OutputStream(samplerate=sr, channels=data.ndim, callback=callback)
             self.is_playing.set()
-            if msg:
-                if loop_start is None or loop_start is None:
-                    msg(f'▶ Press space bar to stop')
-                else:
-                    msg(f'▶ {loop_start}-{loop_end}    Press space bar to stop')
+
+            if loop_start is None or loop_start is None:
+                self.signals.message.emit(f'▶ Press space bar to stop')
+            else:
+                self.signals.message.emit(f'▶ {loop_start}-{loop_end}    Press space bar to stop')
+
             with self.stream:
                 while self.is_playing.is_set():
                     sd.sleep(100)
-                if msg:
-                    if loop_start is None or loop_start is None:
-                        try:
-                            msg(f'■ Press space bar to play')
-                        except RuntimeError as e:
-                            pass
-
-    def stop(self, msg=None):
+                if loop_start is None or loop_start is None:
+                    try:
+                        self.signals.message.emit(f'■ Press space bar to play')
+                    except RuntimeError as e:
+                        print(f'Error: {e}')
+
+    def stop(self):
         if self.is_playing.is_set():
             if self.stream is not None:
                 # self._stream.stop()
                 self.stream.close()
                 self.stream = None
             self.is_playing.clear()
-        if msg:
-            msg('■ Press space bar to play')
+        self.signals.message.emit('■ Press space bar to play')
 
 
 class AudioCallback:

tools/base_tool_UI.py

@@ -30,7 +30,8 @@
 from audio_player import AudioPlayer
 from common_prefs_utils import get_settings, set_settings, read_settings, write_settings
 from common_ui_utils import FilePathLabel, replace_widget, resource_path
-from common_ui_utils import Worker, Node, KeyPressHandler, sample_to_name
+from common_ui_utils import Node, KeyPressHandler, sample_to_name
+from tools.worker import Worker
 from sample_utils import Sample
 from waveform_widgets import WaveformDialog, LoopPointDialog
 
@@ -47,11 +48,16 @@ def __init__(self, parent=None):
         self.options = Node()
 
         self.player = AudioPlayer()
+        self.player.signals.message.connect(self.update_message)
+
         self.temp_audio = Node()
         self.playback_thread = None
 
         self.threadpool = QtCore.QThreadPool(parent=self)
         self.worker = None
+        self.active_workers = []
+        self.worker_result = None
+        self.event_loop = QtCore.QEventLoop()
 
         self.current_dir = Path(__file__).parent
         self.base_dir = self.current_dir.parent
@@ -155,11 +161,21 @@ def get_options(self):
             self.options.suffix = ''
 
     def as_worker(self, cmd):
-        if self.worker:
-            if self.worker.running:
-                return False
-        self.worker = Worker(cmd)
-        self.threadpool.start(self.worker)
+        if not any(worker.running for worker in self.active_workers):
+            self.worker = Worker(cmd)
+
+            # Worker signals
+            self.worker.signals.progress.connect(self.update_progress)
+            self.worker.signals.progress_range.connect(self.update_range)
+            self.worker.signals.message.connect(self.update_message)
+            self.worker.signals.result.connect(self.handle_result)
+
+            self.worker.signals.finished.connect(lambda: self.cleanup_worker(self.worker))
+
+            self.active_workers.append(self.worker)
+            self.threadpool.start(self.worker)
+        else:
+            print('Task is already running!')
 
     def browse_files(self):
         self.refresh_lw_items()
@@ -254,9 +270,7 @@ def play_lw_item(self, *args):
         audio_file = args[0].data(Qt.Qt.UserRole)
         if os.path.isfile(audio_file):
             data, sr = sf.read(audio_file)
-            self.playback_thread = threading.Thread(target=self.player.play,
-                                                    args=(data, sr, None, None, self.progress_pb.setFormat),
-                                                    daemon=True)
+            self.playback_thread = threading.Thread(target=self.player.play, args=(data, sr, None, None), daemon=True)
             self.playback_thread.start()
 
     def key_lw_items_event(self, event):
@@ -295,7 +309,7 @@ def key_lw_items_event(self, event):
 
     def play_stop_toggle(self):
         if self.player.is_playing.is_set():
-            self.player.stop(msg=self.progress_pb.setFormat)
+            self.player.stop()
         else:
             items = self.files_lw.selectedItems()
             if items:
@@ -304,8 +318,7 @@ def play_stop_toggle(self):
                     data, sr = sf.read(audio_file)
                     info = Sample(audio_file)
                     self.playback_thread = threading.Thread(target=self.player.play,
-                                                            args=(data, sr, info.loopStart, info.loopEnd,
-                                                                  self.progress_pb.setFormat), daemon=True)
+                                                            args=(data, sr, info.loopStart, info.loopEnd), daemon=True)
                     self.playback_thread.start()
 
     @staticmethod
@@ -341,7 +354,7 @@ def lw_drop_event(self, event):
             event.ignore()
 
     def closeEvent(self, event):
-        self.player.stop(msg=None)
+        self.player.stop()
         self.removeEventFilter(self)
         print(f'{self.objectName()} closed')
         event.accept()
@@ -393,14 +406,14 @@ def load_settings(self):
         result = read_settings(widget=self, filepath=None, startdir=p, ext=self.settings_ext)
         if result:
             os.chdir(result.parent)
-            self.progress_pb.setFormat(f'{result.name} loaded')
+            self.update_message(f'{result.name} loaded')
 
     def save_settings(self):
         self.set_settings_path()
         result = write_settings(widget=self, filepath=None, startdir=self.settings_path, ext=self.settings_ext)
         if result:
             os.chdir(result.parent)
-            self.progress_pb.setFormat(f'{result.name} saved')
+            self.update_message(f'{result.name} saved')
 
     def get_defaults(self):
         get_settings(self, self.default_settings)
@@ -409,6 +422,24 @@ def restore_defaults(self):
         set_settings(widget=self, node=self.default_settings)
         self.progress_pb.setFormat(f'Default settings restored')
 
+    def update_progress(self, value):
+        self.progress_pb.setValue(value)
+
+    def update_message(self, message):
+        self.progress_pb.setFormat(message)
+
+    def update_range(self, mn, mx):
+        self.progress_pb.setRange(mn, mx)
+        self.progress_pb.update()
+
+    def handle_result(self, value):
+        self.worker_result = value
+        self.event_loop.quit()
+
+    def cleanup_worker(self, worker):
+        if worker in self.active_workers:
+            self.active_workers.remove(worker)
+
 
 def launch(mw, app_id=''):
     """

tools/common_prefs_utils.py

@@ -29,15 +29,18 @@ def get_settings(widget, node):
         if not name or name.startswith('qt_'):
             continue
 
-        match type(child):
-            case QtWidgets.QCheckBox:
+        match child.__class__.__name__:
+            case 'QCheckBox':
                 value = child.isChecked()
-            case QtWidgets.QComboBox:
+            case 'QComboBox':
                 value = child.currentText()
-            case QtWidgets.QSpinBox | QtWidgets.QDoubleSpinBox:
+            case 'QSpinBox' | 'QDoubleSpinBox':
                 value = child.value()
-            case QtWidgets.QLineEdit:
+            case 'QLineEdit' | 'UrlPathLineEdit':
                 value = child.text()
+            case 'FilePathLabel':
+                p = child.fullPath()
+                value = Path(p).as_posix() if p else ''
             case _:
                 value = None
 
@@ -61,20 +64,24 @@ def set_settings(widget, node):
         name = child.objectName()
         if not name or name.startswith('qt_') or not hasattr(node, name):
             continue
+
         value = getattr(node, name)
-        match type(child):
-            case QtWidgets.QCheckBox:
+        match child.__class__.__name__:
+            case 'QCheckBox':
                 child.setChecked(value)
-            case QtWidgets.QComboBox:
+            case 'QComboBox':
                 values = [child.itemText(i) for i in range(child.count())]
                 if value in values:
                     child.setCurrentText(value)
                 else:
                     print(f'{name} QComboxBox skipped : {value} not found in items')
-            case QtWidgets.QSpinBox | QtWidgets.QDoubleSpinBox:
+            case 'QSpinBox' | 'QDoubleSpinBox':
                 child.setValue(value)
-            case QtWidgets.QLineEdit:
+            case 'QLineEdit' | 'UrlPathLineEdit':
                 child.setText(value)
+            case 'FilePathLabel':
+                child.setFullPath(value)
+
     return True