Merged branch - CURA-4270

plugins/VersionUpgrade/VersionUpgrade27to30/VersionUpgrade27to30.py

@@ -27,6 +27,7 @@ _renamed_i18n = {
     "tr": "tr_TR"
 }
 
+
 class VersionUpgrade27to30(VersionUpgrade):
     ##  Gets the version number from a CFG file in Uranium's 2.7 format.
     #
@@ -60,7 +61,7 @@ class VersionUpgrade27to30(VersionUpgrade):
         parser["general"]["version"] = "5"
         if "metadata" not in parser:
             parser["metadata"] = {}
-        parser["metadata"]["setting_version"] = "2"
+        parser["metadata"]["setting_version"] = "3"
 
         #Renamed themes.
         if "theme" in parser["general"]:
@@ -72,7 +73,77 @@ class VersionUpgrade27to30(VersionUpgrade):
             if parser["general"]["language"] in _renamed_i18n:
                 parser["general"]["language"] = _renamed_i18n[parser["general"]["language"]]
 
+        # Renamed settings for skin pre-shrink settings
+        if parser.has_section("general") and "visible_settings" in parser["general"]:
+            visible_settings = parser["general"]["visible_settings"].split(";")
+            new_visible_settings = []
+            renamed_skin_preshrink_names = {"expand_upper_skins": "top_skin_expand_distance",
+                                            "expand_lower_skins": "bottom_skin_expand_distance"}
+            for setting in visible_settings:
+                if setting == "expand_skins_into_infill":
+                    continue # this one is removed
+                if setting in renamed_skin_preshrink_names:
+                    new_visible_settings.append(renamed_skin_preshrink_names[setting])
+                    continue #Don't add the original.
+                new_visible_settings.append(setting) #No special handling, so just add the original visible setting back.
+            parser["general"]["visible_settings"] = ";".join(new_visible_settings)
+
         # Re-serialise the file.
         output = io.StringIO()
         parser.write(output)
-        return [filename], [output.getvalue()]
+        return [filename], [output.getvalue()]
+
+    ##  Upgrades the given instance container file from version 2.7 to 3.0.
+    #
+    #   \param serialised The serialised form of the container file.
+    #   \param filename The name of the file to upgrade.
+    def upgradeOtherContainer(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        # Update the skin pre-shrink settings:
+        #  - Remove the old ones
+        #  - Do not add the new ones. The default values will be used for them.
+        if parser.has_section("values"):
+            for remove_key in ["expand_skins_into_infill", "expand_upper_skins", "expand_lower_skins"]:
+                if remove_key in parser["values"]:
+                    del parser["values"][remove_key]
+
+        for each_section in ("general", "metadata"):
+            if not parser.has_section(each_section):
+                parser.add_section(each_section)
+
+        # Update version numbers
+        parser["general"]["version"] = "2"
+        parser["metadata"]["setting_version"] = "3"
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]
+
+    ##  Upgrades a container stack from version 2.7 to 3.0.
+    #
+    #   \param serialised The serialised form of a container stack.
+    #   \param filename The name of the file to upgrade.
+    def upgradeStack(self, serialised, filename):
+        parser = configparser.ConfigParser(interpolation=None)
+        parser.read_string(serialised)
+
+        for each_section in ("general", "metadata"):
+            if not parser.has_section(each_section):
+                parser.add_section(each_section)
+
+        # Update version numbers
+        if "general" not in parser:
+            parser["general"] = {}
+        parser["general"]["version"] = "3"
+
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "3"
+
+        # Re-serialise the file.
+        output = io.StringIO()
+        parser.write(output)
+        return [filename], [output.getvalue()]