fix: not all resource name edits were recognized in upload dialog (#84)

Author: paulmueller

CHANGELOG

@@ -1,4 +1,5 @@
 0.17.2
+ - fix: not all resource name edits were recognized in upload dialog (#84)
  - fix: check for existence of DC resources before starting uploads (#85)
  - enh: sort resources according to internal basin dependencies (#79)
  - enh: warn user about too many resources in a dataset (#86)

dcoraid/gui/logs/widget_log.py

@@ -77,7 +77,7 @@ def __init__(self, *args, **kwargs):
         self.comboBox_level.setCurrentIndex(0 if is_dev_version else 1)
 
         self.new_message.connect(self.add_colored_item)
-        self.lineEdit_filter.textChanged.connect(self.on_filter_changed)
+        self.lineEdit_filter.textEdited.connect(self.on_filter_changed)
         self.comboBox_level.currentIndexChanged.connect(
             self.on_filter_changed)
         self.toolButton_dir.clicked.connect(self.on_log_dir_open)

dcoraid/gui/upload/dlg_upload.py

@@ -113,13 +113,13 @@ def __init__(self, *args, **kwargs):
         self.toolButton_rem.clicked.connect(self.on_rem_resources)
         self.pushButton_proceed.clicked.connect(self.on_proceed)
         # resource-related signals
-        self.lineEdit_res_filename.textChanged.connect(
+        self.lineEdit_res_filename.textEdited.connect(
             self.on_update_resources_model)
         self.widget_schema.schema_changed.connect(
             self.on_update_resources_model)
         self.selModel.selectionChanged.connect(self.on_selection_changed)
         # do not allow to proceed without a title
-        self.lineEdit_authors.textChanged.connect(self.on_authors_edited)
+        self.lineEdit_authors.textEdited.connect(self.on_authors_edited)
         self.on_authors_edited("")  # initial state
         # if the user changes the preset combobox text, offer them
         # to save it as a preset
@@ -408,9 +408,7 @@ def on_selection_changed(self):
             self.groupBox_res_info.show()
             # populate
             path, data = self.rvmodel.get_data_for_index(sel[0])
-            self.lineEdit_res_filename.blockSignals(True)
             self.lineEdit_res_filename.setText(data["file"]["filename"])
-            self.lineEdit_res_filename.blockSignals(False)
             self.lineEdit_res_path.setText(path)
         else:  # hide resource options
             self.groupBox_res_info.hide()
@@ -440,11 +438,18 @@ def on_update_resources_model(self):
             fn = self.lineEdit_res_filename.text()
             if not fn.endswith(suffix):
                 fn += suffix
-                self.lineEdit_res_filename.blockSignals(True)
                 self.lineEdit_res_filename.setText(fn)
-                self.lineEdit_res_filename.blockSignals(False)
-            if fn != path.name:  # only update filename if user changed it
-                data_dict["file"] = {"filename": fn}
+            # In DCOR-Aid <= 0.17.1, we had an additional check for whether
+            # the `path` in the model is different to `fn`. There probably
+            # were race conditions which caused the model to be updated
+            # while we were checking this here. So the solution is to not
+            # check for changes and always pass through the user input. We
+            # also moved away from `textChanged` signals to `textEdited`
+            # signals. `textEdited` means user-edited while `textChanged`
+            # also includes programmatical changes (we used to block signals
+            # for the lineEdit which we now don't have to do anymore).
+            # See issue #84.
+            data_dict["file"] = {"filename": fn}
         # collect supplementary resource data
         schema = self.widget_schema.get_current_schema()
         if schema:  # only update supplement if user made changes

dcoraid/gui/upload/widget_supplement_item.py

@@ -170,7 +170,7 @@ def __init__(self, *args, **kwargs):
         self.checkBox.clicked.connect(self.on_value_changed)
         self.spinBox.valueChanged.connect(self.on_value_changed)
         self.doubleSpinBox.valueChanged.connect(self.on_value_changed)
-        self.lineEdit.textChanged.connect(self.on_value_changed)
+        self.lineEdit.textEdited.connect(self.on_value_changed)
         self.plainTextEdit.textChanged.connect(self.on_value_changed)
         self.comboBox.currentTextChanged.connect(self.on_value_changed)
         self.radioButton_yes.clicked.connect(self.on_value_changed)