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

history: refactor state tracking 

Add an additional checks to determine if a job needs to be cancelled when we receive a new "printing" state.  A file name mismatch or a decrease in total_duration indicates a virtual sdcard reset.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-12 20:51:29 -05:00
parent 84bc9aa311
commit dd321a4754
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
moonraker/plugins/history.py
View File

@ -108,33 +108,45 @@ class History:
return {"count": end_num - start_num, "jobs": jobs} return {"count": end_num - start_num, "jobs": jobs}
async def _status_update(self, data): async def _status_update(self, data):
if "print_stats" in data: ps = data.get("print_stats", {})
ps = data['print_stats'] if "state" in ps:
old_state = self.print_stats['state']
new_state = ps['state']
new_ps = dict(self.print_stats)
new_ps.update(ps)
if "state" in ps: if new_state is not old_state:
old_state = self.print_stats['state'] if new_state == "printing" and self.current_job is None:
new_state = ps['state'] # always add new job if no existing job is present
self.add_job(PrinterJob(new_ps))
elif self.current_job is not None:
if new_state == "complete":
self.finish_job("completed", new_ps)
if new_state == "standby":
self.finish_job("cancelled", self.print_stats)
elif new_state == "error":
self.finish_job("error", new_ps)
elif new_state == "printing" and \
self._check_need_cancel(new_ps):
# Finish with the previous state
self.finish_job("cancelled", self.print_stats)
self.add_job(PrinterJob(new_ps))
if new_state is not old_state: self.print_stats.update(ps)
if new_state == "printing" and old_state != "paused":
self.print_stats.update(ps)
self.add_job(PrinterJob(self.print_stats))
elif self.current_job is not None:
if new_state == "complete":
self.print_stats.update(ps)
self.finish_job("completed")
if new_state == "standby":
self.finish_job("cancelled")
elif new_state == "error":
self.finish_job("error")
self.print_stats.update(ps)
def _handle_shutdown(self): def _handle_shutdown(self):
self.finish_job("klippy_shutdown") self.finish_job("klippy_shutdown", self.print_stats)
def _handle_disconnect(self): def _handle_disconnect(self):
self.finish_job("klippy_disconnect") self.finish_job("klippy_disconnect", self.print_stats)
def _check_need_cancel(self, new_stats):
# Cancel if the file name has changed, total duration has
# decreased, or if job is not resuming from a pause
ps = self.print_stats
return ps['filename'] != new_stats['filename'] or \
ps['total_duration'] > new_stats['total_duration'] or \
ps['state'] != "paused"
def add_job(self, job): def add_job(self, job):
self.current_job_id = str( self.current_job_id = str(
@ -154,11 +166,11 @@ class History:
return return
def finish_job(self, status): def finish_job(self, status, pstats):
if self.current_job is None: if self.current_job is None:
return return
self.current_job.finish(status, self.print_stats) self.current_job.finish(status, pstats)
# Regrab metadata incase metadata wasn't parsed yet due to file upload # Regrab metadata incase metadata wasn't parsed yet due to file upload
self.grab_job_metadata() self.grab_job_metadata()
self.save_current_job() self.save_current_job()
@ -189,7 +201,7 @@ class History:
{'action': evt_action, 'job': job}) {'action': evt_action, 'job': job})
def on_exit(self): def on_exit(self):
self.finish_job("server_exit") self.finish_job("server_exit", self.print_stats)
class PrinterJob: class PrinterJob:
def __init__(self, data={}): def __init__(self, data={}):