3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More defensive machine name and version check

Browse source 
CURA-4224
This commit is contained in:
Lipu Fei 2017-09-14 08:34:01 +02:00
parent 9567a6921d
commit a48507546f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py
View file

@ -43,13 +43,14 @@ class FirmwareUpdateCheckerJob(Job):
current_version_file = urllib.request.urlopen(request) current_version_file = urllib.request.urlopen(request)
reader = codecs.getreader("utf-8") reader = codecs.getreader("utf-8")
machine_name = self._container.getId() # get machine name from the definition container
machine_name = self._container.definition.getName().lower()
machine_name_parts = machine_name.split(" ")
# If it is not None, then we compare between the checked_version and the current_version # If it is not None, then we compare between the checked_version and the current_version
# Now we just do that if the active printer is Ultimaker 3 or Ultimaker 3 Extended or any # Now we just do that if the active printer is Ultimaker 3 or Ultimaker 3 Extended or any
# other Ultimaker 3 that will come in the future # other Ultimaker 3 that will come in the future
if machine_name[0:11] == "Ultimaker 3": if len(machine_name_parts) >= 2 and machine_name_parts[:2] == ["ultimaker", "3"]:
# Nothing to parse, just get the string # Nothing to parse, just get the string
# TODO: In the future may be done by parsing a JSON file with diferent version for each printer model # TODO: In the future may be done by parsing a JSON file with diferent version for each printer model
current_version = reader(current_version_file).readline().rstrip() current_version = reader(current_version_file).readline().rstrip()