Moved printer state to API endpoint, made apikey instead of login necessary
parent
599bca12a9
commit
6989613b99
|
@ -273,17 +273,6 @@ def sdCommand():
|
||||||
|
|
||||||
return jsonify(SUCCESS)
|
return jsonify(SUCCESS)
|
||||||
|
|
||||||
#~~ Printer State
|
|
||||||
|
|
||||||
@app.route(BASEURL + "state", methods=["GET"])
|
|
||||||
@login_required
|
|
||||||
def getPrinterState():
|
|
||||||
currentData = printer.getCurrentData()
|
|
||||||
currentData.update({
|
|
||||||
"temperatures": printer.getCurrentTemperatures()
|
|
||||||
})
|
|
||||||
return jsonify(currentData)
|
|
||||||
|
|
||||||
#~~ GCODE file handling
|
#~~ GCODE file handling
|
||||||
|
|
||||||
@app.route(BASEURL + "gcodefiles", methods=["GET"])
|
@app.route(BASEURL + "gcodefiles", methods=["GET"])
|
||||||
|
@ -389,6 +378,23 @@ def apiLoad():
|
||||||
printer.selectFile(filepath, False, printAfterSelect)
|
printer.selectFile(filepath, False, printAfterSelect)
|
||||||
return jsonify(SUCCESS)
|
return jsonify(SUCCESS)
|
||||||
|
|
||||||
|
@app.route(APIBASEURL + "state", methods=["GET"])
|
||||||
|
def apiPrinterState():
|
||||||
|
if not settings().get(["api", "enabled"]):
|
||||||
|
abort(401)
|
||||||
|
|
||||||
|
if not "apikey" in request.values.keys():
|
||||||
|
abort(401)
|
||||||
|
|
||||||
|
if request.values["apikey"] != settings().get(["api", "key"]):
|
||||||
|
abort(403)
|
||||||
|
|
||||||
|
currentData = printer.getCurrentData()
|
||||||
|
currentData.update({
|
||||||
|
"temperatures": printer.getCurrentTemperatures()
|
||||||
|
})
|
||||||
|
return jsonify(currentData)
|
||||||
|
|
||||||
#~~ timelapse handling
|
#~~ timelapse handling
|
||||||
|
|
||||||
@app.route(BASEURL + "timelapse", methods=["GET"])
|
@app.route(BASEURL + "timelapse", methods=["GET"])
|
||||||
|
|
Loading…
Reference in New Issue