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

file_manager: attempt to start gcode uploads prior to queueing 

Only attempt to queue the upload if the job failed to start.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-11-26 19:46:59 -05:00
parent f09c313c5b
commit 784b8b9b18
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/components/file_manager/file_manager.py
View File

@ -524,12 +524,7 @@ class FileManager:
started: bool = False started: bool = False
queued: bool = False queued: bool = False
if upload_info['start_print']: if upload_info['start_print']:
if self.queue_gcodes: if can_start:
job_queue: JobQueue = self.server.lookup_component('job_queue')
started = await job_queue.queue_job(
upload_info['filename'], check_exists=False)
queued = not started
elif can_start:
kapis: APIComp = self.server.lookup_component('klippy_apis') kapis: APIComp = self.server.lookup_component('klippy_apis')
try: try:
await kapis.start_print(upload_info['filename']) await kapis.start_print(upload_info['filename'])
@ -538,6 +533,12 @@ class FileManager:
pass pass
else: else:
started = True started = True
if self.queue_gcodes and not started:
job_queue: JobQueue = self.server.lookup_component('job_queue')
started = await job_queue.queue_job(
upload_info['filename'], check_exists=False)
queued = not started
await self.notify_sync_lock.wait(300.) await self.notify_sync_lock.wait(300.)
self.notify_sync_lock = None self.notify_sync_lock = None
if queued: if queued: