Queue one-time tasks in click order

Author: ok-oldking

ok/gui/StartController.py

@@ -21,6 +21,15 @@ def __init__(self, app_config, exit_event):
         self.start_timeout = app_config.get('start_timeout', 60)
         self.start_exe = (app_config.get('windows') or {}).get('start_exe', True)
 
+    @staticmethod
+    def _mark_task_enabled(task):
+        if not task.enabled:
+            task._enabled = True
+            task.info_clear()
+            task.executor.enqueue_onetime_task(task)
+            logger.info(f"enabled task {task}")
+        communicate.task.emit(task)
+
     def start(self, task=None, exit_after=False):
         self.handler.post(lambda: self.do_start(task, exit_after))
 
@@ -40,6 +49,14 @@ def do_start(self, task=None, exit_after=False):
                 task.unpause()
                 communicate.starting_emulator.emit(True, None, 0)
                 return True
+
+            if task and og.executor.current_task and og.executor.current_task != task:
+                logger.info(f"queue task while another task is running {task}")
+                if exit_after:
+                    task.exit_after_task = True
+                self._mark_task_enabled(task)
+                communicate.starting_emulator.emit(True, None, 0)
+                return True
         except Exception as e:
             logger.error(f'do_start resume exception: {e}', e)
             communicate.starting_emulator.emit(True, self.tr(f'Start failed: {e}'), 0)
@@ -76,7 +93,7 @@ def add_task_to_enable(enable_task):
                     task.exit_after_task = True
 
             for task in tasks_to_enable:
-                task._enabled = True
+                self._mark_task_enabled(task)
 
             og.executor.start()
             communicate.starting_emulator.emit(True, None, 0)

ok/gui/i18n/en_US.qm

@@ -932,6 +932,10 @@
             <source>Resume</source>
             <translation>Resume</translation>
         </message>
+        <message>
+            <source>Waiting for {task_name} task to be completed</source>
+            <translation>Waiting for {task_name} task to be completed</translation>
+        </message>
     </context>
     <context>
         <name>TaskOpButton</name>

ok/gui/i18n/en_US.ts

@@ -930,6 +930,10 @@
             <source>Resume</source>
             <translation>Reanudar</translation>
         </message>
+        <message>
+            <source>Waiting for {task_name} task to be completed</source>
+            <translation>Esperando a que se complete la tarea {task_name}</translation>
+        </message>
     </context>
     <context>
         <name>TaskOpButton</name>

ok/gui/i18n/es_ES.qm

@@ -922,6 +922,10 @@
             <source>Resume</source>
             <translation>再開</translation>
         </message>
+        <message>
+            <source>Waiting for {task_name} task to be completed</source>
+            <translation>{task_name} タスクの完了を待機中</translation>
+        </message>
     </context>
     <context>
         <name>TaskOpButton</name>

ok/gui/i18n/es_ES.ts

@@ -931,6 +931,10 @@
             <source>Resume</source>
             <translation>재개</translation>
         </message>
+        <message>
+            <source>Waiting for {task_name} task to be completed</source>
+            <translation>{task_name} 작업 완료 대기 중</translation>
+        </message>
     </context>
     <context>
         <name>TaskOpButton</name>