Update 3MFWorkspaceReader to handle the new format of ContainerStack

Contributes to CURA-3098
This commit is contained in:
Arjen Hiemstra 2016-12-08 11:48:34 +01:00
parent 0d023a196e
commit 3449108d59

View file

@ -447,9 +447,17 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
def _getContainerIdListFromSerialized(self, serialized): def _getContainerIdListFromSerialized(self, serialized):
parser = configparser.ConfigParser(interpolation=None, empty_lines_in_values=False) parser = configparser.ConfigParser(interpolation=None, empty_lines_in_values=False)
parser.read_string(serialized) parser.read_string(serialized)
container_ids = []
if "containers" in parser:
for index, container_id in parser.items("containers"):
container_ids.append(container_id)
elif parser.has_option("general", "containers"):
container_string = parser["general"].get("containers", "") container_string = parser["general"].get("containers", "")
container_list = container_string.split(",") container_list = container_string.split(",")
return [container_id for container_id in container_list if container_id != ""] container_ids = [container_id for container_id in container_list if container_id != ""]
return container_ids
def _getMachineNameFromSerializedStack(self, serialized): def _getMachineNameFromSerializedStack(self, serialized):
parser = configparser.ConfigParser(interpolation=None, empty_lines_in_values=False) parser = configparser.ConfigParser(interpolation=None, empty_lines_in_values=False)
@ -462,3 +470,4 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
for entry in metadata: for entry in metadata:
return entry.text return entry.text
pass pass