WIP

uilib/converters/burnsimImporter.py

@@ -53,7 +53,7 @@ def importPropellant(node):
 
 class BurnSimImporter(Importer):
     def __init__(self, manager):
-        super().__init__(manager, 'BurnSim Motor', 'Loads motor files for BurnSim 3.0', {'.bsx': 'BurnSim Files'})
+        super().__init__(manager, 'BurnSim File', 'Loads motor files for BurnSim 3.0', {'.bsx': 'BurnSim Files'})
 
     def doConversion(self, path):
         motor = motorlib.motor.Motor()

uilib/fileManager.py

@@ -5,7 +5,7 @@
 import motorlib
 
 from .fileIO import saveFile, loadFile, fileTypes
-from .helpers import FLAGS_NO_ICON
+from .helpers import FLAGS_NO_ICON, excludeKeys
 from .logger import logger
 
 class FileManager(QObject):
@@ -189,27 +189,45 @@ def checkPropellant(self, motor):
         if motor.propellant is None:
             return motor
 
+        propManager = self.app.propellantManager
         originalName = motor.propellant.getProperty('name')
         # If the motor has a propellant that we don't have, add it to our library
-        if originalName not in self.app.propellantManager.getNames():
+        if originalName not in propManager.getNames():
+            # Check if any propellants in the library have the same properties and offer to dedupe
+            for libraryPropellantName in propManager.getNames():
+                libraryProperties = excludeKeys(libraryPropellantName, ['name'])
+                motorProperties = excludeKeys(motor.propellant, ['name'])
+                if libraryProperties == motorProperties:
+                    message = 'The propellant from the loaded motor ("{}") was not in the library, but the properties match "{}" from the library. Should the loaded motor be updated to use this propellant?'
+                    shouldDeDupe = True # TODO: actually check
+                    if shouldDeDupe:
+                        motor.propellant.setProperty('name', libraryPropellantName)
+                        return motor
+
             self.app.outputMessage('The propellant from the loaded motor was not in the library, so it was added as "{}"'.format(originalName),
                                    'New propellant added')
-            self.app.propellantManager.propellants.append(motor.propellant)
-            self.app.propellantManager.savePropellants()
+            propManager.propellants.append(motor.propellant)
+            propManager.savePropellants()
             logger.log('Propellant from loaded motor added to library under original name "{}"'.format(originalName))
 
             return motor
 
-        # If a propellant by the name already exists, we need to check if they are the same and change the name if not
-        if motor.propellant.getProperties() == self.app.propellantManager.getPropellantByName(originalName).getProperties():
-            return motor
-
-        addedNumber = 1
-        while motor.propellant.getProperty('name') + ' (' + str(addedNumber) + ')' in self.app.propellantManager.getNames():
+        addedNumber = 0
+        name = originalName
+        while name in propManager.getNames():
+            existingProps = excludeKeys(propManager.getPropellantByName(name).getProperties(), ['name'])
+            motorProps = excludeKeys(motor.propellant.getProperties(), ['name'])
+            if existingProps == motorProps:
+                # If this isn't the first loop, we need to change the name
+                if addedNumber != 0:
+                    motor.propellant.setProperty('name', name)
+                    logger.log('Loaded propellant has name "{}", but did not match properties of propellant with that name in library. Did match "{}", so updating to that name'.format(originalName, name))
+                return motor
             addedNumber += 1
-        motor.propellant.setProperty('name', originalName + ' (' + str(addedNumber) + ')')
-        self.app.propellantManager.propellants.append(motor.propellant)
-        self.app.propellantManager.savePropellants()
+            name = '{} ({})'.format(originalName, addedNumber)
+        motor.propellant.setProperty('name', '{} ({})'.format(originalName, addedNumber))
+        propManager.propellants.append(motor.propellant)
+        propManager.savePropellants()
         self.app.outputMessage('The propellant from the loaded motor matches an existing item in the library, but they have different properties. The propellant from the motor has been added to the library as "{}"'.format(motor.propellant.getProperty('name')),
                                'New propellant added')
 

uilib/helpers.py

@@ -1,3 +1,6 @@
 from PyQt6.QtCore import Qt
 
 FLAGS_NO_ICON = Qt.WindowType.Dialog | Qt.WindowType.CustomizeWindowHint | Qt.WindowType.WindowTitleHint | Qt.WindowType.WindowCloseButtonHint
+
+def excludeKeys(d, keys):
+	return {k:v for k,v in d.items() if k not in keys}