3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data_store: update request handlers to accept WebRequest objects 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-09 07:01:04 -05:00
parent 7cd51fe1eb
commit 870cabfa05
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/plugins/data_store.py
View File

@ -98,7 +98,7 @@ class DataStore:
self.temperature_store[sensor]['temperatures'].append(temp) self.temperature_store[sensor]['temperatures'].append(temp)
self.temperature_store[sensor]['targets'].append(target) self.temperature_store[sensor]['targets'].append(target)
async def _handle_temp_store_request(self, path, method, args): async def _handle_temp_store_request(self, web_request):
store = {} store = {}
for name, sensor in self.temperature_store.items(): for name, sensor in self.temperature_store.items():
store[name] = {k: list(v) for k, v in sensor.items()} store[name] = {k: list(v) for k, v in sensor.items()}
@ -111,15 +111,9 @@ class DataStore:
curtime = time.time() curtime = time.time()
self.gcode_queue.append({'message': response, 'time': curtime}) self.gcode_queue.append({'message': response, 'time': curtime})
async def _handle_gcode_store_request(self, path, method, args): async def _handle_gcode_store_request(self, web_request):
count = args.get("count", None) count = web_request.get_int("count", None)
if count is not None: if count is not None:
try:
count = int(count)
except Exception:
raise self.server.error(
"Parameter <count> must be an integer value, "
f"received: {count}")
res = list(self.gcode_queue)[-count:] res = list(self.gcode_queue)[-count:]
else: else:
res = list(self.gcode_queue) res = list(self.gcode_queue)