pyqttoolkit 0.7.17__tar.gz → 0.7.19__tar.gz

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.17
+Version: 0.7.19
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-11-14T16:08:41+0000",
+ "date": "2023-11-30T14:17:40+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "6ea766f9669e1f37295ab7d55240d2da4f6f521a",
- "version": "0.7.17"
+ "full-revisionid": "d6e6bf0240ca9ca38bab15aee03585197d0020a7",
+ "version": "0.7.19"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit/logs/__init__.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from typing import Callable
+from io import StringIO
 import logging
 from logging import handlers
 from functools import wraps
@@ -109,3 +111,30 @@ def logf(level, log_args=True):
             return result
         return _
     return logf_decorator
+
+
+class LogStream:
+    def __init__(self, notify_update: Callable = None):
+        self._buffer = StringIO()
+        self._notify_update = notify_update
+
+    def __iadd__(self, other):
+        self.write(other)
+        return self
+
+    def write(self, message):
+        self._buffer.write(message)
+        if self._notify_update:
+            self._notify_update()
+
+    def flush(self):
+        self._buffer.flush()
+
+    def getvalue(self):
+        return self._buffer.getvalue()
+
+    def clear(self):
+        self._buffer.close()
+        self._buffer = StringIO()
+        if self._notify_update:
+            self._notify_update()

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit/models/code_text.py

@@ -17,6 +17,7 @@
 from PyQt5.QtCore import QObject, pyqtSignal
 
 from pyqttoolkit.properties import AutoProperty
+from pyqttoolkit.logs import LogStream
 
 class CodeTextModel(QObject):
     def __init__(self, parent, validator):
@@ -24,16 +25,19 @@ class CodeTextModel(QObject):
         self.textChanged.connect(self._validate)
         self._validator = validator
         self.text = ''
-        self.output = ''
+        self.output = LogStream(self._handle_output_buffer_changed)
 
     textChanged = pyqtSignal(str)
-    outputChanged = pyqtSignal(str)
+    outputChanged = pyqtSignal(LogStream)
     validationMessageChanged = pyqtSignal(str)
 
     text = AutoProperty(str)
-    output = AutoProperty(str)
+    output = AutoProperty(LogStream)
     validationMessage = AutoProperty(str)
 
     def _validate(self, value):
         validation_model = self._validator(value)
         self.validationMessage = validation_model.error if validation_model else ''
+
+    def _handle_output_buffer_changed(self):
+        self.outputChanged.emit(self.output)

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit/services/task_runner.py

@@ -178,7 +178,7 @@ class TaskRunner(QObject):
         self._is_cancelled = False
         self._executor = ThreadPoolExecutor(max_workers=1, thread_name_prefix='TaskRunner_Thread')
 
-    def run_task(self, task_function, task_args=None, on_completed=None, on_cancelled=None, on_error=None, description=None, error_description=None, show_progress=True, cancellable=False, **kwargs):
+    def run_task(self, task_function, task_args=None, on_completed=None, on_cancelled=None, on_error=None, description=None, error_description=None, show_progress=True, cancellable=False, force_indeterminate_start=False, **kwargs):
         """function::runTask(self, task_function, task_args, on_completed, on_error)
         :param task_function: The function to execute
         :param task_args: The arguments to pass to the function
@@ -194,7 +194,7 @@ class TaskRunner(QObject):
 
         if 'update_progress' in parameters:
             kwargs['update_progress'] = self.update_progress
-            indeterminate = False
+            indeterminate = force_indeterminate_start
         else:
             indeterminate = True
 

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit/views/code/code_edit.py

@@ -194,7 +194,7 @@ class CodeEdit(QWidget):
         self._text_edit.setPlainText(model.text)
         model.textChanged.connect(self._set_text(self._text_edit))
         if hasattr(model, 'output'):
-            self._output_pane.setPlainText(model.output)
+            self._output_pane.setPlainText(model.output.getvalue())
             model.outputChanged.connect(self._set_text(self._output_pane, True))
             self._output_pane.setVisible(True)
         else:
@@ -207,6 +207,7 @@ class CodeEdit(QWidget):
         def _(text):
             widget_inst = widget_ref()
             if widget_inst:
+                text = text if isinstance(text, str) else text.getvalue()
                 if widget_inst.toPlainText() != text:
                     widget_inst.setPlainText(text)
                     if scroll_to_end:

{pyqttoolkit-0.7.17 → pyqttoolkit-0.7.19}/pyqttoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.17
+Version: 0.7.19
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd