3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Test with named tuples, not working yet

Browse source
This commit is contained in:
ChrisTerBeke 2018-11-19 16:35:19 +01:00
parent c04ce7fce8
commit 2497325d60
3 changed files with 53 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/UM3NetworkPrinting/src/SendMaterialJob.py
View file

@ -156,8 +156,8 @@ class SendMaterialJob(Job):
# \throw KeyError Raised when on of the materials does not include a valid guid
@classmethod
def _parseReply(cls, reply: QNetworkReply) -> Dict[str, ClusterMaterial]:
remote_materials_list = json.loads(reply.readAll().data().decode("utf-8"))
return {material["guid"]: ClusterMaterial(**material) for material in remote_materials_list}
remote_materials = json.loads(reply.readAll().data().decode("utf-8"))
return {material["id"]: ClusterMaterial(**material) for material in remote_materials}
## Retrieves a list of local materials
#
@ -170,12 +170,12 @@ class SendMaterialJob(Job):
material_containers = container_registry.findContainersMetadata(type = "material")
# Find the latest version of all material containers in the registry.
for m in material_containers:
local_materials = {} # type: Dict[str, LocalMaterial]
for material in material_containers:
try:
material = LocalMaterial(**m)
material = LocalMaterial(**material)
if material.GUID not in result or material.version > result.get(material.GUID).version:
result[material.GUID] = material
local_materials[material.GUID] = material
except ValueError:
Logger.logException("w", "Local material {} has invalid values.".format(m["id"]))
Logger.logException("w", "Local material {} has invalid values.".format(material["id"]))
return result