CURA-5175 Add variants to the version upgrade.

Upgrade the version number in the variants and add the hardware_type
metadata.

2 files changed, 27 insertions, 1 deletions

diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
index 9840c91bd0..3de451632f 100644
--- a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
+++ b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py
@@ -151,4 +151,20 @@ class VersionUpgrade32to33(VersionUpgrade):
 
         result = io.StringIO()
         parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades a variant container to the new format.
+    def upgradeVariants(self, serialized, filename):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        #Add the hardware type to the variants
+        if "metadata" in parser and "hardware_type" not in parser["metadata"]:
+            parser["metadata"]["hardware_type"] = "nozzle"
+
+        #Update version number.
+        parser["general"]["version"] = "3"
+
+        result = io.StringIO()
+        parser.write(result)
         return [filename], [result.getvalue()]
\ No newline at end of file
diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
index 72ff6e1de9..36e0036bec 100644
--- a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
+++ b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
@@ -13,8 +13,10 @@ def getMetaData():
             ("extruder_train", 3000004):     ("extruder_train", 4000004,     upgrade.upgradeStack),
 
             ("definition_changes", 2000004): ("definition_changes", 3000004, upgrade.upgradeInstanceContainer),
+            ("quality", 2000004):            ("quality", 3000004,            upgrade.upgradeInstanceContainer),
             ("quality_changes", 2000004):    ("quality_changes", 3000004,    upgrade.upgradeQualityChanges),
-            ("user", 2000004):               ("user", 3000004,               upgrade.upgradeInstanceContainer)
+            ("user", 2000004):               ("user", 3000004,               upgrade.upgradeInstanceContainer),
+            ("variant", 2000004):            ("variant", 3000004,            upgrade.upgradeVariants)
         },
         "sources": {
             "machine_stack": {
@@ -29,6 +31,10 @@ def getMetaData():
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./definition_changes"}
             },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
             "quality_changes": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./quality"}
@@ -36,6 +42,10 @@ def getMetaData():
             "user": {
                 "get_version": upgrade.getCfgVersion,
                 "location": {"./user"}
+            },
+            "variant": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./variants"}
             }
         }
     }