From 784b8b9b182f870cbcf9f2a05fda0ded3a1f1d57 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Fri, 26 Nov 2021 19:46:59 -0500 Subject: [PATCH] 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 --- moonraker/components/file_manager/file_manager.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/moonraker/components/file_manager/file_manager.py b/moonraker/components/file_manager/file_manager.py index 6c84722..a4edc50 100644 --- a/moonraker/components/file_manager/file_manager.py +++ b/moonraker/components/file_manager/file_manager.py @@ -524,12 +524,7 @@ class FileManager: started: bool = False queued: bool = False if upload_info['start_print']: - if self.queue_gcodes: - 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: + if can_start: kapis: APIComp = self.server.lookup_component('klippy_apis') try: await kapis.start_print(upload_info['filename']) @@ -538,6 +533,12 @@ class FileManager: pass else: 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.) self.notify_sync_lock = None if queued: