Generate more possible machine IDs in XML material profile

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -212,11 +212,12 @@ class XmlMaterialProfile(InstanceContainer):
 
         for definition_id, container in machine_container_map.items():
             definition = container.getDefinition()
-            try:
-                product = UM.Dictionary.findKey(product_id_map, definition_id)
-            except ValueError:
-                # An unknown product id; export it anyway
+
             product = definition_id
+            for product_name, product_id_list in product_id_map.items():
+                if definition_id in product_id_list:
+                    product = product_name
+                    break
 
             builder.start("machine")
             builder.start("machine_identifier", {
@@ -530,11 +531,11 @@ class XmlMaterialProfile(InstanceContainer):
 
             identifiers = machine.iterfind("./um:machine_identifier", self.__namespaces)
             for identifier in identifiers:
-                machine_id = product_id_map.get(identifier.get("product"), None)
-                if machine_id is None:
-                    # Lets try again with some naive heuristics.
-                    machine_id = identifier.get("product").replace(" ", "").lower()
+                machine_id_list = product_id_map.get(identifier.get("product"), [])
+                if not machine_id_list:
+                    machine_id_list.append(identifier.get("product").replace(" ", "").lower())
 
+                for machine_id in machine_id_list:
                     definitions = ContainerRegistry.getInstance().findDefinitionContainersMetadata(id = machine_id)
                     if not definitions:
                         Logger.log("w", "No definition found for machine ID %s", machine_id)
@@ -631,6 +632,10 @@ class XmlMaterialProfile(InstanceContainer):
                         if is_new_material:
                             containers_to_add.append(new_hotend_material)
 
+                        # there is only one ID for a machine. Once we have reached here, it means we have already found
+                        # a workable ID for that machine, so there is no need to continue
+                        break
+
         for container_to_add in containers_to_add:
             ContainerRegistry.getInstance().addContainer(container_to_add)
 
@@ -720,10 +725,11 @@ class XmlMaterialProfile(InstanceContainer):
                     machine_compatibility = cls._parseCompatibleValue(entry.text)
 
             for identifier in machine.iterfind("./um:machine_identifier", cls.__namespaces):
-                machine_id = product_id_map.get(identifier.get("product"), None)
-                if machine_id is None:
-                    # Lets try again with some naive heuristics.
-                    machine_id = identifier.get("product").replace(" ", "").lower()
+                machine_id_list = product_id_map.get(identifier.get("product"), [])
+                if not machine_id_list:
+                    machine_id_list.append(identifier.get("product").replace(" ", "").lower())
+
+                for machine_id in machine_id_list:
                     definition_metadata = ContainerRegistry.getInstance().findDefinitionContainersMetadata(id = machine_id)
                     if not definition_metadata:
                         Logger.log("w", "No definition found for machine ID %s", machine_id)
@@ -794,6 +800,10 @@ class XmlMaterialProfile(InstanceContainer):
                         if len(found_materials) == 0:
                             result_metadata.append(new_hotend_material_metadata)
 
+                        # there is only one ID for a machine. Once we have reached here, it means we have already found
+                        # a workable ID for that machine, so there is no need to continue
+                        break
+
         return result_metadata
 
     def _addSettingElement(self, builder, instance):
@@ -818,10 +828,32 @@ class XmlMaterialProfile(InstanceContainer):
     #
     #   This loads the mapping from a file.
     @classmethod
-    def getProductIdMap(cls) -> Dict[str, str]:
+    def getProductIdMap(cls) -> Dict[str, List[str]]:
         product_to_id_file = os.path.join(os.path.dirname(sys.modules[cls.__module__].__file__), "product_to_id.json")
         with open(product_to_id_file) as f:
-            return json.load(f)
+            product_to_id_map = json.load(f)
+
+        # generate a few more combinations so it can be smart about finding IDs
+        product_to_id_map = {key: [value] for key, value in product_to_id_map.items()}
+        for name, id_list in product_to_id_map.items():
+            name_parts = name.split(" ")
+            merged_name_parts = []
+            for part in name_parts:
+                if len(part) == 0:
+                    continue
+                if len(merged_name_parts) == 0:
+                    merged_name_parts.append(part.lower())
+                    continue
+                if part.isdigit():
+                    # for names with digit(s) such as Ultimaker 3 Extended, we generate an ID like
+                    # "ultimaker3_extended", ignoring the space between "Ultimaker" and "3".
+                    merged_name_parts[-1] = merged_name_parts[-1] + part.lower()
+
+            generated_id = "_".join(merged_name_parts)
+            if generated_id not in id_list:
+                id_list.append(generated_id)
+
+        return product_to_id_map
 
     ##  Parse the value of the "material compatible" property.
     @classmethod