enh: refresh upload panel

Author: paulmueller

CHANGELOG

@@ -6,9 +6,9 @@
  - fix: finalize/ephermalize job when upload finishes when widget not visible
  - fix: race condition in `DownloadJob.get_status`
  - enh: display DCOR instance title in search bar
- - enh: increase download panel refresh rate to 2 Hz
- - enh: initialize download panel with final column widths
- - enh: add tool tip with full resource and dataset name in download panel
+ - enh: increase up/download panel refresh rate to 2 Hz
+ - enh: initialize up/download panel with final column widths
+ - enh: add tool tip with full resource and dataset name in up/download panel
  - enh: make icons "grayer" so they work in dark themes as well
  - enh: add `SQLiteKeyJSONDatabase` for persistent metadata storage
  - enh: add `MetaCache` for persistent metadata management

dcoraid/gui/panel_uploads/widget_upload.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import threading
 import warnings
 from functools import lru_cache
 import os.path as os_path
@@ -381,20 +382,29 @@ def __init__(self, *args, **kwargs):
             QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
 
         self._jobs = None
+        self._finished_uploads = []
+        self._on_update_job_status_lock = threading.Lock()
 
         settings = QtCore.QSettings()
         if bool(int(settings.value("debug/without timers", "0"))):
             self.timer = None
         else:
             self.timer = QtCore.QTimer()
-            self.timer.timeout.connect(self.update_job_status)
-            self.timer.start(1000)
-        self._finished_uploads = []
+            self.timer.timeout.connect(self.on_update_job_status)
+            self.timer.start(500)
 
         # signals
         self.itemSelectionChanged.connect(self.on_selection)
         self.itemClicked.connect(self.on_selection)
 
+        # Set columns and spacing for upload table
+        self.setColumnCount(6)
+        header = self.horizontalHeader()
+        header.setSectionResizeMode(
+            0, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
+        header.setSectionResizeMode(
+            1, QtWidgets.QHeaderView.ResizeMode.Stretch)
+
     @property
     def jobs(self):
         """Upload job list
@@ -430,12 +440,12 @@ def set_job_list(self, jobs):
     @QtCore.pyqtSlot(str)
     def on_job_abort(self, dataset_id):
         self.jobs.abort_job(dataset_id)
-        self.update_job_status()
+        self.on_update_job_status()
 
     @QtCore.pyqtSlot(str)
     def on_job_delete(self, dataset_id):
         self.jobs.remove_job(dataset_id)
-        self.update_job_status()
+        self.on_update_job_status()
 
     @QtCore.pyqtSlot()
     def on_selection(self):
@@ -460,7 +470,7 @@ def on_upload_finished(self, dataset_id):
                 self.logger.error(tb.format_exc())
 
     @QtCore.pyqtSlot()
-    def update_job_status(self):
+    def on_update_job_status(self):
         """Update UI with information from self.jobs (UploadJobList)"""
         # Let everyone know when a job is done
         for job in self.jobs:
@@ -470,13 +480,18 @@ def update_job_status(self):
         if not self.isVisible() or not self.jobs:
             # Don't update the UI if nobody is looking anyway.
             return
+        if self._on_update_job_status_lock.locked():
+            return
+
+        with self._on_update_job_status_lock:
+            self.update_job_status()
+
+    def update_job_status(self):
         # disable updates
         self.setUpdatesEnabled(False)
         # make sure the length of the table is long enough
         self.setRowCount(len(self.jobs))
         if self.jobs:
-            self.setColumnCount(6)
-
             for row, job in enumerate(self.jobs):
                 status = job.get_status()
                 self.set_label_item(row, 0, job.dataset_id[:5])
@@ -486,12 +501,9 @@ def update_job_status(self):
                 self.set_label_item(row, 4, job.get_rate_string())
                 self.set_actions_item(row, 5, job)
 
-            # spacing (did not work in __init__)
-            header = self.horizontalHeader()
-            header.setSectionResizeMode(
-                0, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
-            header.setSectionResizeMode(
-                1, QtWidgets.QHeaderView.ResizeMode.Stretch)
+                QtWidgets.QApplication.processEvents(
+                    QtCore.QEventLoop.ProcessEventsFlag.AllEvents, 300)
+
         # enable updates again
         self.setUpdatesEnabled(True)
 
@@ -504,11 +516,13 @@ def set_label_item(self, row, col, label):
         item = self.item(row, col)
         if item is None:
             item = QtWidgets.QTableWidgetItem(label)
+            item.setToolTip(label)
             item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
             self.setItem(row, col, item)
         else:
             if item.text() != label:
                 item.setText(label)
+                item.setToolTip(label)
 
     def set_actions_item(self, row, col, job):
         """Set/Create a TableCellActions widget in the table

tests/test_gui.py

@@ -230,7 +230,7 @@ def test_gui_upload_simple(mw, qtbot):
                         dataset_id=dlg.dataset_id,
                         set_job_done=False)
 
-    mw.panel_upload.widget_jobs.update_job_status()
+    mw.panel_upload.widget_jobs.on_update_job_status()
     QtWidgets.QApplication.processEvents(
         QtCore.QEventLoop.ProcessEventsFlag.AllEvents, 200)
     assert mw.database.get_dataset_dict(dlg.dataset_id)