Wed, 20 Jul 2022 17:52:08 +0200
Implemented a little change to the CycloneDX configuration dialog to ensure the selected file has an extension and that it matches the selected format..
src/eric7/CycloneDXInterface/CycloneDXConfigDialog.py | file | annotate | diff | comparison | revisions |
--- a/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.py Wed Jul 20 17:28:28 2022 +0200 +++ b/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.py Wed Jul 20 17:52:08 2022 +0200 @@ -97,7 +97,7 @@ self.__repopulateSchemaVersionComboBox ) - self.filePicker.setMode(EricPathPickerModes.SAVE_FILE_OVERWRITE_MODE) + self.filePicker.setMode(EricPathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE) self.filePicker.setDefaultDirectory(self.__defaultDirectory) self.fileFormatComboBox.setCurrentText(CycloneDXConfigDialog.DefaultFileFormat) @@ -142,10 +142,17 @@ # set the file filter if fileFormat == "JSON": self.filePicker.setFilters(self.tr("JSON Files (*.json);;All Files (*)")) + suffix = ".json" elif fileFormat == "XML": self.filePicker.setFilters(self.tr("XML Files (*.xml);;All Files (*)")) + suffix = ".xml" else: self.filePicker.setFilters(self.tr("All Files (*)")) + suffix = "" + + filePath = self.filePicker.path() + if bool(filePath.name): + self.filePicker.setPath(filePath.with_suffix(suffix)) @pyqtSlot() def __editMetaData(self):