rbeesoft 2.0.0__tar.gz → 2.0.1__tar.gz

{rbeesoft-2.0.0 → rbeesoft-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbeesoft
-Version: 2.0.0
+Version: 2.0.1
 Summary: 
 Author: Brecheisen
 Author-email: r.brecheisen@maastrichtuniversity.nl

{rbeesoft-2.0.0 → rbeesoft-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rbeesoft"
-version = "2.0.0"
+version = "2.0.1"
 description = ""
 authors = [
     {name = "Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}

rbeesoft-2.0.1/src/rbeesoft/app/core/processes/dummyprocess.py

@@ -0,0 +1,18 @@
+import time
+from rbeesoft.app.core.processes.process import Process
+
+
+class DummyProcess(Process):
+    def __init__(self):
+        super(DummyProcess, self).__init__()
+        self._n = 10
+
+    def execute(self):
+        out = []
+        for i in range(self._n):
+            if self.is_canceled():
+                return out
+            time.sleep(0.25)
+            out.append(i)
+            self.progress.emit(int((i+1)/self._n*100))
+        return out

rbeesoft-2.0.1/src/rbeesoft/app/core/processes/process.py

@@ -0,0 +1,64 @@
+from PySide6.QtCore import (
+    QObject, 
+    QThread, 
+    Signal, 
+    Slot,
+    QCoreApplication,
+)
+
+
+class Process(QObject):
+    progress = Signal(int)
+    finished = Signal(object)
+    failed = Signal(Exception)
+    started = Signal()
+    canceled = Signal()
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self._cancel = False
+        self._thread = None
+        self._main_thread = None
+
+    def name(self):
+        return self._name
+
+    def cancel(self):
+        self._cancel = True
+
+    def is_canceled(self) -> bool:
+        return self._cancel
+
+    def execute(self):
+        raise NotImplementedError
+
+    def start(self):
+        if self._thread is not None:
+            raise RuntimeError("Process already started")
+        self._main_thread = QCoreApplication.instance().thread()
+        self._thread = QThread()
+        self.moveToThread(self._thread)
+        self._thread.started.connect(self._run_internal)
+        self.finished.connect(self._thread.quit)
+        self.failed.connect(self._thread.quit)
+        self._thread.finished.connect(self._cleanup)
+        self._thread.start()
+
+    @Slot()
+    def _run_internal(self):
+        self.started.emit()
+        try:
+            if self._cancel:
+                self.canceled.emit()
+                self.finished.emit(None)
+                return
+            result = self.execute()
+            self.finished.emit(result)
+        except Exception as e:
+            self.failed.emit(e)
+
+    @Slot()
+    def _cleanup(self):
+        self.moveToThread(self._main_thread)
+        self._thread.deleteLater()
+        self._thread = None

rbeesoft-2.0.1/src/rbeesoft/app/core/processes/processrunner.py

@@ -0,0 +1,34 @@
+from rbeesoft.common.singleton import singleton
+from rbeesoft.common.logmanager import LogManager
+
+LOG = LogManager()
+
+
+@singleton
+class ProcessRunner:
+    current_process = {}
+
+    def start(self, process, callback_progress=None, callback_finished=None, callback_failed=None):
+        if callback_progress:
+            process.progress.connect(callback_progress)
+        else:
+            process.progress.connect(self.handle_process_progress)
+        if callback_finished:
+            process.finished.connect(callback_finished)
+        else:
+            process.finished.connect(self.handle_process_finished)
+        if callback_failed:
+            process.failed.connect(callback_failed)
+        else:
+            process.failed.connect(self.handle_process_failed)
+        self.current_process = process
+        self.current_process.start()
+
+    def handle_process_progress(self, progress):
+        LOG.info(f'Progress: {progress}')
+
+    def handle_process_finished(self, result):
+        LOG.info(f'Process finished successfully: {result}')
+
+    def handle_process_failed(self, error):
+        LOG.error(f'Process failed ({error})')

{rbeesoft-2.0.0 → rbeesoft-2.0.1}/src/rbeesoft/app/main.py

@@ -2,6 +2,8 @@ import sys
 from PySide6 import QtWidgets, QtCore
 from rbeesoft.app.ui.rbeesoftmainwindow import RbeesoftMainWindow
 from rbeesoft.app.ui.widgets.pages.page import Page
+from rbeesoft.app.core.processes.process import Process
+from rbeesoft.app.core.processes.processrunner import ProcessRunner
 
 
 class MainWindow(RbeesoftMainWindow):
@@ -23,15 +25,22 @@ class HomePage(Page):
         super(HomePage, self).__init__('home', 'HomePage', settings)
         button = QtWidgets.QPushButton('Go to next page')
         button.clicked.connect(self.handle_button)
+        process_button = QtWidgets.QPushButton('Run process')
+        process_button.clicked.connect(self.handle_process_button)
+        self._process_runner = ProcessRunner()
         layout = QtWidgets.QVBoxLayout()
         layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
         layout.addWidget(QtWidgets.QLabel(self.title()))
         layout.addWidget(button)
+        layout.addWidget(process_button)
         self.setLayout(layout)
 
     def handle_button(self):
         self.switch_to_page('next')
 
+    def handle_process_button(self):
+        self._process_runner.start(ExampleProcess())
+
 
 class NextPage(Page):
     def __init__(self, settings):
@@ -48,6 +57,23 @@ class NextPage(Page):
         self.switch_to_page('home')
 
 
+class ExampleProcess(Process):
+    def __init__(self):
+        super(ExampleProcess, self).__init__()
+        self._n = 10
+
+    def execute(self):
+        import time
+        out = []
+        for i in range(self._n):
+            if self.is_canceled():
+                return out
+            time.sleep(0.25)
+            out.append(i)
+            self.progress.emit(int((i+1)/self._n*100))
+        return out
+
+
 def main():
     QtWidgets.QApplication.setApplicationName('example')
     app = QtWidgets.QApplication(sys.argv)