Add check for platform mesh & texture

It simply checks if the file exists
This commit is contained in:
Jaime van Kessel 2019-02-15 14:42:50 +01:00
parent c3b447cd89
commit 338f9c0052
8 changed files with 11 additions and 7 deletions

View file

@ -8,7 +8,6 @@
"manufacturer": "Cubicon", "manufacturer": "Cubicon",
"visible": true, "visible": true,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "",
"supports_usb_connection": false, "supports_usb_connection": false,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "cubicon_3dp_110f_extruder_0" "0": "cubicon_3dp_110f_extruder_0"

View file

@ -8,7 +8,6 @@
"manufacturer": "Cubicon", "manufacturer": "Cubicon",
"visible": true, "visible": true,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "",
"supports_usb_connection": false, "supports_usb_connection": false,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "cubicon_3dp_210f_extruder_0" "0": "cubicon_3dp_210f_extruder_0"

View file

@ -8,7 +8,6 @@
"manufacturer": "Cubicon", "manufacturer": "Cubicon",
"visible": true, "visible": true,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "",
"supports_usb_connection": false, "supports_usb_connection": false,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": "cubicon_3dp_310f_extruder_0" "0": "cubicon_3dp_310f_extruder_0"

View file

@ -8,7 +8,6 @@
"manufacturer": "Deltaprintr", "manufacturer": "Deltaprintr",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform_offset": [0, 0, 0], "platform_offset": [0, 0, 0],
"platform": "",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "delta_go_extruder_0" "0": "delta_go_extruder_0"

View file

@ -7,7 +7,6 @@
"author": "Chris Pearson", "author": "Chris Pearson",
"manufacturer": "Printrbot", "manufacturer": "Printrbot",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "",
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "printrbot_play_heated_extruder_0" "0": "printrbot_play_heated_extruder_0"

View file

@ -9,7 +9,6 @@
"manufacturer": "uBuild-3D", "manufacturer": "uBuild-3D",
"category": "Other", "category": "Other",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "mr_bot_280_platform.stl",
"has_materials": true, "has_materials": true,
"preferred_quality_type": "draft", "preferred_quality_type": "draft",
"machine_extruder_trains": "machine_extruder_trains":

View file

@ -18,7 +18,8 @@ Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__),
machine_filepaths = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions")) machine_filepaths = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions"))
all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes"))
all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images"))
@pytest.fixture @pytest.fixture
def definition_container(): def definition_container():
@ -44,5 +45,13 @@ def isDefinitionValid(definition_container, path, file_name):
parser, is_valid = definition_container.readAndValidateSerialized(json) parser, is_valid = definition_container.readAndValidateSerialized(json)
if not is_valid: if not is_valid:
print("The definition '{0}', has invalid data.".format(file_name)) print("The definition '{0}', has invalid data.".format(file_name))
metadata = DefinitionContainer.deserializeMetadata(json, "whatever")
# If the definition defines a platform file, it should be in /resources/meshes/
if "platform" in metadata[0]:
assert metadata[0]["platform"] in all_meshes
if "platform_texture" in metadata[0]:
assert metadata[0]["platform_texture"] in all_images
return is_valid return is_valid

View file

@ -41,6 +41,7 @@ def collectAllSettingIds():
definition_container.deserialize(data.read()) definition_container.deserialize(data.read())
return definition_container.getAllKeys() return definition_container.getAllKeys()
def collectAllVariants(): def collectAllVariants():
result = [] result = []
for root, directories, filenames in os.walk(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "variants"))): for root, directories, filenames in os.walk(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "variants"))):