Move version upgrade for intents from 4.1-4.2 to 4.3-4.4

CURA-6599
This commit is contained in:
Jaime van Kessel 2019-09-10 10:46:23 +02:00
parent f8472d6414
commit e9862fb348
No known key found for this signature in database
GPG key ID: 3710727397403C91
1022 changed files with 1174 additions and 1031 deletions

View file

@ -147,7 +147,7 @@ class CuraApplication(QtApplication):
# SettingVersion represents the set of settings available in the machine/extruder definitions.
# You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
# changes of the settings.
SettingVersion = 9
SettingVersion = 10
Created = False

View file

@ -308,18 +308,6 @@ class VersionUpgrade41to42(VersionUpgrade):
# Update version number.
parser["metadata"]["setting_version"] = "8"
parser["general"]["version"] = "5"
# We should only have 6 levels when we start.
assert "7" not in parser["containers"]
# We added the intent container in Cura 4.2. This means that all other containers move one step down.
parser["containers"]["7"] = parser["containers"]["6"]
parser["containers"]["6"] = parser["containers"]["5"]
parser["containers"]["5"] = parser["containers"]["4"]
parser["containers"]["4"] = parser["containers"]["3"]
parser["containers"]["3"] = parser["containers"]["2"]
parser["containers"]["2"] = "empty_intent"
# Change renamed profiles.
if "containers" in parser:
@ -347,4 +335,4 @@ class VersionUpgrade41to42(VersionUpgrade):
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
return [filename], [result.getvalue()]

View file

@ -0,0 +1,68 @@
import configparser
from typing import Tuple, List
import io
from UM.VersionUpgrade import VersionUpgrade
class VersionUpgrade43to44(VersionUpgrade):
pass
def getCfgVersion(self, serialised: str) -> int:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialised)
format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised.
setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
return format_version * 1000000 + setting_version
## Upgrades Preferences to have the new version number.
#
# This renames the renamed settings in the list of visible settings.
def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation = None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "10"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
## Upgrades instance containers to have the new version
# number.
#
# This renames the renamed settings in the containers.
def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation=None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "10"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
## Upgrades stacks to have the new version number.
def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
parser = configparser.ConfigParser(interpolation=None)
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "10"
parser["general"]["version"] = "5"
# We should only have 6 levels when we start.
assert "7" not in parser["containers"]
# We added the intent container in Cura 4.4. This means that all other containers move one step down.
parser["containers"]["7"] = parser["containers"]["6"]
parser["containers"]["6"] = parser["containers"]["5"]
parser["containers"]["5"] = parser["containers"]["4"]
parser["containers"]["4"] = parser["containers"]["3"]
parser["containers"]["3"] = parser["containers"]["2"]
parser["containers"]["2"] = "empty_intent"
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]

View file

@ -0,0 +1,62 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Any, Dict, TYPE_CHECKING
from . import VersionUpgrade43to44
if TYPE_CHECKING:
from UM.Application import Application
upgrade = VersionUpgrade43to44.VersionUpgrade43to44()
def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("preferences", 6000009): ("preferences", 6000010, upgrade.upgradePreferences),
("machine_stack", 4000009): ("machine_stack", 5000010, upgrade.upgradeStack),
("extruder_train", 4000009): ("extruder_train", 5000010, upgrade.upgradeStack),
("definition_changes", 4000009): ("definition_changes", 4000010, upgrade.upgradeInstanceContainer),
("quality_changes", 4000009): ("quality_changes", 4000010, upgrade.upgradeInstanceContainer),
("quality", 4000009): ("quality", 4000010, upgrade.upgradeInstanceContainer),
("user", 4000009): ("user", 4000010, upgrade.upgradeInstanceContainer),
},
"sources": {
"preferences": {
"get_version": upgrade.getCfgVersion,
"location": {"."}
},
"machine_stack": {
"get_version": upgrade.getCfgVersion,
"location": {"./machine_instances"}
},
"extruder_train": {
"get_version": upgrade.getCfgVersion,
"location": {"./extruders"}
},
"definition_changes": {
"get_version": upgrade.getCfgVersion,
"location": {"./definition_changes"}
},
"quality_changes": {
"get_version": upgrade.getCfgVersion,
"location": {"./quality_changes"}
},
"quality": {
"get_version": upgrade.getCfgVersion,
"location": {"./quality"}
},
"user": {
"get_version": upgrade.getCfgVersion,
"location": {"./user"}
}
}
}
def register(app: "Application") -> Dict[str, Any]:
return {"version_upgrade": upgrade}

View file

@ -0,0 +1,8 @@
{
"name": "Version Upgrade 4.3 to 4.4",
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
"api": "6.0",
"i18n-catalog": "cura"
}

View file

@ -1,6 +1,6 @@
import configparser
import VersionUpgrade41to42
import VersionUpgrade43to44
before_update = """[general]
version = 4
@ -22,7 +22,7 @@ type = machine
def test_upgrade():
upgrader = VersionUpgrade41to42.VersionUpgrade41to42()
upgrader = VersionUpgrade43to44.VersionUpgrade43to44()
file_name, new_data = upgrader.upgradeStack(before_update, "whatever")
parser = configparser.ConfigParser(interpolation=None)
parser.read_string(new_data[0])

View file

@ -798,6 +798,23 @@
}
}
},
"VersionUpgrade43to44": {
"package_info": {
"package_id": "VersionUpgrade43to44",
"package_type": "plugin",
"display_name": "Version Upgrade 4.3 to 4.4",
"description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
"package_version": "1.0.0",
"sdk_version": "6.0.0",
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"X3DReader": {
"package_info": {
"package_id": "X3DReader",

View file

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 9,
"setting_version": 10,
"visible": false,
"position": "0"
},

View file

@ -7,7 +7,7 @@
"author": "Ultimaker",
"category": "Other",
"manufacturer": "Unknown",
"setting_version": 9,
"setting_version": 10,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri3
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri3
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_pri5
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_pri5
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Extra Fine
definition = abax_titan
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Fine
definition = abax_titan
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_4max
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_chiron
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_chiron
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_chiron
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Draft
definition = anycubic_i3_mega
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = draft
weight = -2

View file

@ -4,7 +4,7 @@ name = High
definition = anycubic_i3_mega
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = anycubic_i3_mega
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -1

View file

@ -4,7 +4,7 @@ name = High Quality
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = builder_premium_small
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = 3

View file

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = extra coarse
weight = 4

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = -3

View file

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = extra coarse
weight = -4

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = 3

View file

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = extra coarse
weight = 4

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = 3

View file

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = extra coarse
weight = 4

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = 3

View file

@ -4,7 +4,7 @@ name = Extra Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = extra coarse
weight = 4

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = High
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = high
weight = 1

View file

@ -4,7 +4,7 @@ name = Normal
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = normal
weight = 0

View file

@ -4,7 +4,7 @@ name = Coarse
definition = cartesio
[metadata]
setting_version = 9
setting_version = 10
type = quality
quality_type = coarse
weight = 3

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