`8901475`

some 'thread safety'

Authored by

espadonne Apr 23, 2025

SHA: 89014751d098942a8cda31b3531a3194459ac54f
Parents: a92f02f
Tree: 7fc8df9

1 changed file

Status	File	+	-
M	`src/wulftp/wulftp.py`	49	21

src/wulftp/wulftp.pymodified

  import os
  import sys
 -import threading
  import paramiko
  import qtawesome as qta
  from dotenv import load_dotenv
  from PyQt6.QtCore import Qt, QSize
 +from PyQt6.QtCore import pyqtSignal, QRunnable, QThreadPool
  from PyQt6.QtWidgets import (
      QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout, QLabel,
      QLineEdit, QToolButton, QPushButton, QListWidget, QFileDialog, QMessageBox, QFormLayout,
+ )
+-
  from .sftp_backend import SFTPBackend
 +class UploadRunnable(QRunnable):
 +    """
 +    QRunnable for performing SFTP upload in a thread pool.
 +    Emits finish or error signals on completion.
 +    """
 +    def __init__(self, backend, local_path, remote_path, finish_signal, error_signal):
 +        super().__init__()
 +        self.backend = backend
 +        self.local_path = local_path
 +        self.remote_path = remote_path
 +        self.finish_signal = finish_signal
 +        self.error_signal = error_signal
++
 +    def run(self):
 +        try:
 +            self.backend.upload(self.local_path, self.remote_path)
 +            self.finish_signal.emit()
 +        except Exception as e:
 +            self.error_signal.emit(str(e))
++
++
  # fetch default host/port from .env
  load_dotenv()
  DEFAULT_HOST = os.getenv('WULFTP_HOST', '')
  class WulFTPClient(QMainWindow):
 +    # signals for thread-safe UI updates
 +    remote_refreshed = pyqtSignal()
 +    upload_error = pyqtSignal(str)
++
      def __init__(self):
          super().__init__()
          self.backend = SFTPBackend()
          self.sftp = None
          self.init_ui()
 +        # setup thread pool and connect signals
 +        self.threadpool = QThreadPool()
 +        self.remote_refreshed.connect(self.refresh_remote)
 +        self.upload_error.connect(self.show_error)
++
      def init_ui(self):
          """build and arrange ui elements."""
          self.setWindowTitle('wulFTP POC')
              local_path = url.toLocalFile()
              filename = os.path.basename(local_path)
              remote_file = os.path.join(self.remote_path, filename)
+-
 -            def task(lp=local_path, rf=remote_file):
 -                try:
 -                    self.backend.upload(lp, rf)
 -                    self.refresh_remote()
 -                except Exception as e:
 -                    self.show_error(str(e))
+-
 -            threading.Thread(target=task, daemon=True).start()
+-
 +            # schedule upload in thread pool
 +            runnable = UploadRunnable(
 +                self.backend,
 +                local_path,
 +                remote_file,
 +                self.remote_refreshed,
 +                self.upload_error
 +            )
 +            self.threadpool.start(runnable)
          event.acceptProposedAction()
      def browse_key(self):
      def browse_and_upload(self):
          """open file dialog and upload the selected file to remote."""
+-
          path, _ = QFileDialog.getOpenFileName(self, 'select file to upload')
          if not path:
              return
          filename = os.path.basename(path)
          remote_file = os.path.join(self.remote_path, filename)
 -        def task():
 -            try:
 -                self.backend.upload(path, remote_file)
 -                self.refresh_remote()
 -            except Exception as e:
 -                self.show_error(str(e))
+-
 -        threading.Thread(target=task, daemon=True).start()
 +        # schedule file upload in thread pool
 +        runnable = UploadRunnable(
 +            self.backend,
 +            path,
 +            remote_file,
 +            self.remote_refreshed,
 +            self.upload_error
 +        )
 +        self.threadpool.start(runnable)
  def main():