Implement conversion of profiles 2.1->2.2

This works more or less the same as for machine instances. The code was copied from version 2.1 of the unserialise function of profiles, and optimised a bit. The output function is written from scratch. It has some code duplication. Maybe we have to do something about that.

Contributes to issue CURA-844.

plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py

@@ -1,20 +1,113 @@
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2016 Ultimaker B.V.
 # Cura is released under the terms of the AGPLv3 or higher.
 
+import UM.SettingsError #To indicate that a file is of incorrect format.
+
+import configparser #To read config files.
+import io #To write config files to strings as if they were files.
+
 ##  Creates a new profile instance by parsing a serialised profile in version 1
 #   of the file format.
 #
 #   \param serialised The serialised form of a profile in version 1.
 #   \return A profile instance, or None if the file format is incorrect.
 def importVersion1(serialised):
-    return None #Not implemented yet.
+    return Profile(serialised)
 
 ##  A representation of a profile used as intermediary form for conversion from
 #   one format to the other.
 class Profile:
+    ##  Reads version 1 of the file format, storing it in memory.
+    #
+    #   \param serialised A string with the contents of a machine instance file.
+    def __init__(self, serialised):
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+
+        #Check correctness.
+        if not parser.has_section("general"):
+            raise SettingsError.InvalidFormatError("general")
+        if not parser.has_option("general", "version") or int(parser.get("general", "version")) != 1: #Hard-coded profile version here. If this number changes the entire function needs to change.
+            raise SettingsError.InvalidVersionError("Version upgrade intermediary version 1")
+
+        #Parse the general section.
+        self._name = parser.get("general", "name")
+        self._type = parser.get("general", "type", fallback = None)
+        if "weight" in parser["general"]:
+            self._weight = int(parser.get("general", "weight"))
+        else:
+            self._weight = None
+        self._machine_type_id = parser.get("general", "machine_type", fallback = None)
+        self._machine_variant_name = parser.get("general", "machine_variant", fallback = None)
+        self._machine_instance_name = parser.get("general", "machine_instance", fallback = None)
+        if "material" in parser["general"]:
+            self._material_name = parser.get("general", "material")
+        elif self._type == "material":
+            self._material_name = parser.get("general", "name", fallback = None)
+        else:
+            self._material_name = None
+
+        #Parse the settings.
+        self._settings = {}
+        if parser.has_section("settings"):
+            for key, value in parser["settings"].items():
+                self._settings[key] = value
+
+        #Parse the defaults and the disabled defaults.
+        self._changed_settings_defaults = {}
+        if parser.has_section("defaults"):
+            for key, value in parser["defaults"].items():
+                self._changed_settings_defaults[key] = value
+        self._disabled_settings_defaults = []
+        if parser.has_section("disabled_defaults"):
+            disabled_defaults_string = parser.get("disabled_defaults", "values")
+            for item in disabled_defaults_string.split(","):
+                if item != "":
+                    self._disabled_settings_defaults.append(item)
+
     ##  Serialises this profile as file format version 2.
     #
     #   \return A serialised form of this profile, serialised in version 2 of
     #   the file format.
     def exportVersion2():
-        raise Exception("Not implemented yet.")
+        config = configparser.ConfigParser(interpolation = None)
+
+        config.add_section("general")
+        config.set("general", "version", "2") #Hard-coded profile version 2
+        config.set("general", "name", self._name)
+        if self._type:
+            config.set("general", "type", self._type)
+        if self._weight:
+            config.set("general", "weight", self._weight)
+        if self._machine_type_id:
+            config.set("general", "machine_type", self._machine_type_id)
+        if self._machine_variant_name:
+            config.set("general", "machine_variant", self._machine_variant_name)
+        if self._machine_instance_name:
+            config.set("general", "machine_instance", self._machine_instance_name)
+        if self._material_name and self._type != "material":
+            config.set("general", "material", self._material_name)
+
+        if self._settings:
+            config.add_section("settings")
+            for key, value in self._settings.items():
+                if key == "speed_support_lines": #Setting key was changed for 2.2.
+                    key = "speed_support_infill"
+                config.set("settings", key, value)
+
+        if self._changed_settings_defaults:
+            config.add_section("defaults")
+            for key, value in self._changed_settings_defaults.items():
+                if key == "speed_support_lines": #Setting key was changed for 2.2.
+                    key = "speed_support_infill"
+                config.set("defaults", key, value)
+
+        if self._disabled_settings_defaults:
+            config.add_section("disabled_defaults")
+            disabled_defaults_string = str(self._disabled_settings_defaults[0]) #Must be at least 1 item, otherwise we wouldn't enter this if statement.
+            for item in self._disabled_settings_defaults[1:]:
+                disabled_defaults_string += "," + str(item)
+
+        output = io.StringIO()
+        config.write(output)
+        return output.getvalue()