GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 01:25:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035]

Browse Source
This commit is contained in:
Remco Burema 2018-12-19 17:34:31 +01:00
parent fa268184be
commit 9dbc642967
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,11 +101,10 @@ class SendMaterialJob(Job):
continue continue
file_name = os.path.basename(file_path) file_name = os.path.basename(file_path)
material_id = urllib.parse.unquote_plus(mime_type.stripExtension(file_name)) material_id = urllib.parse.unquote_plus(mime_type.stripExtension(file_name)).lower()
if material_id not in materials_to_send: if material_id not in materials_to_send:
# If the material does not have to be sent we skip it. # If the material does not have to be sent we skip it.
continue continue
self._sendMaterialFile(file_path, file_name, material_id) self._sendMaterialFile(file_path, file_name, material_id)
## Send a single material file to the printer. ## Send a single material file to the printer.
@ -182,6 +181,7 @@ class SendMaterialJob(Job):
# Create a new local material # Create a new local material
local_material = LocalMaterial(**material) local_material = LocalMaterial(**material)
local_material.id = material["base_file"].lower() # Don't compare each profile, only base materials.
if local_material.GUID not in result or \ if local_material.GUID not in result or \
local_material.version > result.get(local_material.GUID).version: local_material.version > result.get(local_material.GUID).version: