Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5

Version Upgrade 2.4 to 2.5
This commit is contained in:
jack 2017-03-14 16:05:43 +01:00 committed by GitHub
commit 284e620da2
127 changed files with 247 additions and 135 deletions

View File

@ -0,0 +1,77 @@
# Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher.
import configparser #To parse the files we need to upgrade and write the new files.
import io #To serialise configparser output to a string.
from UM.VersionUpgrade import VersionUpgrade
_removed_settings = { #Settings that were removed in 2.5.
"start_layers_at_same_position"
}
## A collection of functions that convert the configuration of the user in Cura
# 2.4 to a configuration for Cura 2.5.
#
# All of these methods are essentially stateless.
class VersionUpgrade24to25(VersionUpgrade):
## Gets the version number from a CFG file in Uranium's 2.4 format.
#
# Since the format may change, this is implemented for the 2.4 format only
# and needs to be included in the version upgrade system rather than
# globally in Uranium.
#
# \param serialised The serialised form of a CFG file.
# \return The version number stored in the CFG file.
# \raises ValueError The format of the version number in the file is
# incorrect.
# \raises KeyError The format of the file is incorrect.
def getCfgVersion(self, serialised):
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialised)
return int(parser.get("general", "version")) #Explicitly give an exception when this fails. That means that the file format is not recognised.
## Upgrades the preferences file from version 2.4 to 2.5.
#
# \param serialised The serialised form of a preferences file.
# \param filename The name of the file to upgrade.
def upgradePreferences(self, serialised, filename):
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialised)
#Remove settings from the visible_settings.
if parser.has_section("general") and "visible_settings" in parser["general"]:
visible_settings = parser["general"]["visible_settings"].split(";")
visible_settings = filter(lambda setting: setting not in _removed_settings, visible_settings)
parser["general"]["visible_settings"] = ";".join(visible_settings)
#Change the version number in the file.
if parser.has_section("general"): #It better have!
parser["general"]["version"] = "5"
#Re-serialise the file.
output = io.StringIO()
parser.write(output)
return [filename], [output.getvalue()]
## Upgrades an instance container from version 2.4 to 2.5.
#
# \param serialised The serialised form of a quality profile.
# \param filename The name of the file to upgrade.
def upgradeInstanceContainer(self, serialised, filename):
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialised)
#Remove settings from the [values] section.
if parser.has_section("values"):
for removed_setting in (_removed_settings & parser["values"].keys()): #Both in keys that need to be removed and in keys present in the file.
del parser["values"][removed_setting]
#Change the version number in the file.
if parser.has_section("general"):
parser["general"]["version"] = "3"
#Re-serialise the file.
output = io.StringIO()
parser.write(output)
return [filename], [output.getvalue()]

View File

@ -0,0 +1,44 @@
# Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher.
from . import VersionUpgrade24to25
from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura")
upgrade = VersionUpgrade24to25.VersionUpgrade24to25()
def getMetaData():
return {
"plugin": {
"name": catalog.i18nc("@label", "Version Upgrade 2.4 to 2.5"),
"author": "Ultimaker",
"version": "1.0",
"description": catalog.i18nc("@info:whatsthis", "Upgrades configurations from Cura 2.4 to Cura 2.5."),
"api": 3
},
"version_upgrade": {
# From To Upgrade function
("preferences", 4): ("preferences", 5, upgrade.upgradePreferences),
("quality", 2): ("quality", 3, upgrade.upgradeInstanceContainer),
("variant", 2): ("variant", 3, upgrade.upgradeInstanceContainer), #We can re-use upgradeContainerStack since there is nothing specific to quality, variant or user profiles being changed.
("user", 2): ("user", 3, upgrade.upgradeInstanceContainer)
},
"sources": {
"quality": {
"get_version": upgrade.getCfgVersion,
"location": {"./quality"}
},
"preferences": {
"get_version": upgrade.getCfgVersion,
"location": {"."}
},
"user": {
"get_version": upgrade.getCfgVersion,
"location": {"./user"}
}
}
}
def register(app):
return { "version_upgrade": upgrade }

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_pri3

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = abax_pri3

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_pri3

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_pri5

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = abax_pri5

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_pri5

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_titan

View File

@ -1,8 +1,8 @@
[general]
version = 2
version = 3
name = High Quality
definition = abax_titan
[metadata]
type = quality
material = generic_pla

View File

@ -1,6 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = abax_titan

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Low Quality
definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker2_plus

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Not Supported
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Superdraft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Verydraft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Superdraft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Verydraft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Not Supported
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Not Supported
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Not Supported
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Not Supported
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Fast Print
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = High Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Normal Quality
definition = ultimaker3

View File

@ -1,5 +1,5 @@
[general]
version = 2
version = 3
name = Draft Print
definition = ultimaker3

Some files were not shown because too many files have changed in this diff Show More