diff --git a/crosspoint_reader/config.py b/crosspoint_reader/config.py index 8a0408a..2765dcf 100644 --- a/crosspoint_reader/config.py +++ b/crosspoint_reader/config.py @@ -24,6 +24,7 @@ PREFS.defaults['path'] = '/' PREFS.defaults['chunk_size'] = 2048 PREFS.defaults['debug'] = False PREFS.defaults['fetch_metadata'] = False +PREFS.defaults['send_to_root'] = False class CrossPointConfigWidget(QWidget): @@ -38,6 +39,7 @@ class CrossPointConfigWidget(QWidget): self.chunk_size.setRange(512, 65536) self.debug = QCheckBox('Enable debug logging', self) self.fetch_metadata = QCheckBox('Fetch metadata (slower device list)', self) + self.send_to_root = QCheckBox('Send to root (ignore folder template)', self) self.host.setText(PREFS['host']) self.port.setValue(PREFS['port']) @@ -45,6 +47,7 @@ class CrossPointConfigWidget(QWidget): self.chunk_size.setValue(PREFS['chunk_size']) self.debug.setChecked(PREFS['debug']) self.fetch_metadata.setChecked(PREFS['fetch_metadata']) + self.send_to_root.setChecked(PREFS['send_to_root']) layout.addRow('Host', self.host) layout.addRow('Port', self.port) @@ -58,6 +61,7 @@ class CrossPointConfigWidget(QWidget): layout.addRow('Chunk size', self.chunk_size) layout.addRow('', self.debug) layout.addRow('', self.fetch_metadata) + layout.addRow('', self.send_to_root) self.log_view = QPlainTextEdit(self) self.log_view.setReadOnly(True) @@ -79,6 +83,7 @@ class CrossPointConfigWidget(QWidget): PREFS['chunk_size'] = int(self.chunk_size.value()) PREFS['debug'] = bool(self.debug.isChecked()) PREFS['fetch_metadata'] = bool(self.fetch_metadata.isChecked()) + PREFS['send_to_root'] = bool(self.send_to_root.isChecked()) def _refresh_logs(self): self.log_view.setPlainText(get_log_text()) diff --git a/crosspoint_reader/driver.py b/crosspoint_reader/driver.py index 64e4f8b..4dcd78f 100644 --- a/crosspoint_reader/driver.py +++ b/crosspoint_reader/driver.py @@ -304,7 +304,7 @@ class CrossPointDevice(DeviceConfig, DevicePlugin): filepath = infile filename = os.path.basename(name) subdirs = [] - if metadata and i < len(metadata): + if metadata and i < len(metadata) and not PREFS['send_to_root']: subdirs, filename = self._format_upload_path(metadata[i], filename) if subdirs: