From 71a0f6ef85f2124d5fb25b55d6ec577a56265fe4 Mon Sep 17 00:00:00 2001 From: AnyISalIn Date: Mon, 21 Aug 2023 17:48:56 +0800 Subject: feat: replace threading.Lock() to FIFOLock Signed-off-by: AnyISalIn --- modules/progress.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/progress.py') diff --git a/modules/progress.py b/modules/progress.py index e32b59dd..a25a0113 100644 --- a/modules/progress.py +++ b/modules/progress.py @@ -72,7 +72,12 @@ def progressapi(req: ProgressRequest): completed = req.id_task in finished_tasks if not active: - return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo="In queue..." if queued else "Waiting...") + textinfo = "Waiting..." + if queued: + sorted_queued = sorted(pending_tasks.keys(), key=lambda x: pending_tasks[x]) + queue_index = sorted_queued.index(req.id_task) + textinfo = "In queue: {}/{}".format(queue_index + 1, len(sorted_queued)) + return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo=textinfo) progress = 0 -- cgit v1.2.1