q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed jobData key

master
Gina Häußge 2013-05-27 01:20:45 +02:00
parent 624630ac63
commit 3130c0c30b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
octoprint/events.py
View File

@ -191,10 +191,12 @@ class CommandTrigger(GenericEventListener):
if "currentZ" in currentData.keys() and currentData["currentZ"] is not None:
params["currentZ"] = str(currentData["currentZ"])
if "jobData" in currentData.keys() and currentData["jobData"] is not None:
params["filename"] = currentData["jobData"]["filename"]
if "progress" in currentData.keys() and currentData["progress"] is not None and currentData["jobData"]["lines"] is not None:
params["progress"] = str(round(currentData["progress"] * 100 / currentData["jobData"]["lines"]))
if "job" in currentData.keys() and currentData["job"] is not None:
params["filename"] = currentData["job"]["filename"]
if "progress" in currentData.keys() and currentData["progress"] is not None \
and "progress" in currentData["progress"].keys() and currentData["progress"]["progress"] is not None \
and currentData["job"]["lines"] is not None:
params["progress"] = str(round(currentData["progress"]["progress"] * 100 / currentData["job"]["lines"]))
return command % params