GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 22:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added validation to the models

Browse Source
This commit is contained in:
Marijn Deé 2018-11-26 14:30:17 +01:00
parent 68a90ec510
commit a382b77eaa
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/UM3NetworkPrinting/src/Models.py
View File

@ -6,6 +6,10 @@
class BaseModel: class BaseModel:
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.__dict__.update(kwargs) self.__dict__.update(kwargs)
self.validate()
def validate(self):
pass
## Class representing a material that was fetched from the cluster API. ## Class representing a material that was fetched from the cluster API.
@ -19,6 +23,10 @@ class ClusterMaterial(BaseModel):
self.density = None # type: str self.density = None # type: str
super().__init__(**kwargs) super().__init__(**kwargs)
def validate(self):
if not self.guid:
raise ValueError("guid is required on ClusterMaterial")
## Class representing a local material that was fetched from the container registry. ## Class representing a local material that was fetched from the container registry.
class LocalMaterial(BaseModel): class LocalMaterial(BaseModel):
@ -40,3 +48,9 @@ class LocalMaterial(BaseModel):
self.definition = None # type: str self.definition = None # type: str
self.compatible = None # type: bool self.compatible = None # type: bool
super().__init__(**kwargs) super().__init__(**kwargs)
def validate(self):
if not self.GUID:
raise ValueError("guid is required on LocalMaterial")
if not self.id:
raise ValueError("id is required on LocalMaterial")

4
plugins/UM3NetworkPrinting/src/SendMaterialJob.py
View File

@ -159,8 +159,8 @@ class SendMaterialJob(Job):
Logger.log("e", "Request material storage on printer: I didn't understand the printer's answer.") Logger.log("e", "Request material storage on printer: I didn't understand the printer's answer.")
except json.JSONDecodeError: except json.JSONDecodeError:
Logger.log("e", "Request material storage on printer: I didn't understand the printer's answer.") Logger.log("e", "Request material storage on printer: I didn't understand the printer's answer.")
except TypeError: except ValueError:
Logger.log("e", "Request material storage on printer: Printer's answer was missing GUIDs.") Logger.log("e", "Request material storage on printer: Printer's answer was missing a value.")
## Retrieves a list of local materials ## Retrieves a list of local materials
# #