From 2646fa825b909e661c8a0216d4b47ad3d3b4999f Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Thu, 11 Aug 2022 20:48:45 +0300 Subject: [PATCH] Get Files from File input line to match user expectation - If a user manually edits the input file lines, clicking start should use that. Currently it just looks at the files selected last via file browser - We want to allow users to manually enter file paths in field. Which is why the field hasn't been set to read-only --- src/interface/desktop/configure_screen.py | 2 +- src/interface/desktop/file_browser.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/interface/desktop/configure_screen.py b/src/interface/desktop/configure_screen.py index 18069980..e0b7e747 100644 --- a/src/interface/desktop/configure_screen.py +++ b/src/interface/desktop/configure_screen.py @@ -157,7 +157,7 @@ class ConfigureScreen(QtWidgets.QDialog): default_search_config = self.get_default_config(search_type = child.search_type) self.new_config['content-type'][child.search_type.value] = merge_dicts(current_search_config, default_search_config) elif isinstance(child, FileBrowser) and child.search_type in self.new_config['content-type']: - self.new_config['content-type'][child.search_type.value]['input-files'] = child.getPaths() + self.new_config['content-type'][child.search_type.value]['input-files'] = child.getPaths() if child.getPaths() != [] else None def update_processor_settings(self): "Update config with conversation settings from UI" diff --git a/src/interface/desktop/file_browser.py b/src/interface/desktop/file_browser.py index bc87235e..901ad94e 100644 --- a/src/interface/desktop/file_browser.py +++ b/src/interface/desktop/file_browser.py @@ -65,4 +65,7 @@ class FileBrowser(QtWidgets.QWidget): self.lineEdit.setText(",".join(self.filepaths)) def getPaths(self): - return self.filepaths + if self.lineEdit.text() == '': + return [] + else: + return self.lineEdit.text().split(',')