ok-script 1.0.129__tar.gz → 1.0.130__tar.gz

{ok_script-1.0.129/ok_script.egg-info → ok_script-1.0.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.129
+Version: 1.0.130
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/StartController.py

@@ -24,45 +24,56 @@ class StartController(QObject):
     def start(self, task=None, exit_after=False):
         self.handler.post(lambda: self.do_start(task, exit_after))
 
-    def do_start(self, task=None, exit_after=False):
-        communicate.starting_emulator.emit(False, None, self.start_timeout)
-        tasks_to_enable = []
-        try:
-            logger.info(f'do_start: call do_refresh {self.start_exe}')
-            og.device_manager.do_refresh(True)
-        except Exception as e:
-            logger.error(f'do_start do_refresh exception: {e}', e)
+    def do_start(self, task=None, exit_after=False):
+        communicate.starting_emulator.emit(False, None, self.start_timeout)
+        tasks_to_enable = []
+        try:
+            if isinstance(task, int):
+                task = og.executor.onetime_tasks[task]
+                logger.info(f"enable param task {task}")
+
+            if task and task.enabled and task.paused:
+                logger.info(f"resume paused task {task}")
+                if exit_after:
+                    task.exit_after_task = True
+                    communicate.task.emit(task)
+                task.unpause()
+                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)
+            return False
+
+        try:
+            logger.info(f'do_start: call do_refresh {self.start_exe}')
+            og.device_manager.do_refresh(True)
+        except Exception as e:
+            logger.error(f'do_start do_refresh exception: {e}', e)
             communicate.starting_emulator.emit(True, self.tr(str(e)), 0)
             return False
 
-        try:
-            if self.start_exe:
-                if not self.start_device():
-                    return False
-            else:
+        try:
+            if self.start_exe:
+                if not self.start_device():
+                    return False
+            else:
                 logger.info('windows.start_exe is False, skip start_device')
             self.check_gpu_driver_post_processing()
 
-            def add_task_to_enable(enable_task):
-                if enable_task and enable_task not in tasks_to_enable:
-                    tasks_to_enable.append(enable_task)
-
-            for start_task in og.executor.get_all_tasks():
-                if getattr(start_task, 'enable_after_start', False):
-                    logger.info(f"enable_after_start task {start_task}")
-                    add_task_to_enable(start_task)
-
-            if isinstance(task, int):
-                task = og.executor.onetime_tasks[task]
-                logger.info(f"enable param task {task}")
-                add_task_to_enable(task)
-                if exit_after and task:
-                    task.exit_after_task = True
-                    communicate.task.emit(task)
-            elif task:
-                add_task_to_enable(task)
-                if exit_after:
-                    task.exit_after_task = True
+            def add_task_to_enable(enable_task):
+                if enable_task and enable_task not in tasks_to_enable:
+                    tasks_to_enable.append(enable_task)
+
+            for start_task in og.executor.get_all_tasks():
+                if getattr(start_task, 'enable_after_start', False):
+                    logger.info(f"enable_after_start task {start_task}")
+                    add_task_to_enable(start_task)
+
+            if task:
+                add_task_to_enable(task)
+                if exit_after:
+                    task.exit_after_task = True
 
             for task in tasks_to_enable:
                 task._enabled = True

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/en_US.ts

@@ -846,6 +846,14 @@
             <source>OCR</source>
             <translation>OCR</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>Screenshot Folder</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>Log Folder</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/es_ES.ts

@@ -844,6 +844,14 @@
             <source>OCR</source>
             <translation>OCR</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>Carpeta de capturas</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>Carpeta de registros</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/ja_JP.ts

@@ -836,6 +836,14 @@
             <source>Capture</source>
             <translation>キャプチャ</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>スクリーンショットフォルダー</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>ログフォルダー</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/ko_KR.ts

@@ -845,6 +845,14 @@
             <source>OCR</source>
             <translation>OCR</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>스크린샷 폴더</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>로그 폴더</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/zh_CN.ts

@@ -842,6 +842,14 @@
             <source>Capture</source>
             <translation>截图</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>截图目录</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>日志目录</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>

{ok_script-1.0.129 → ok_script-1.0.130}/ok/gui/i18n/zh_TW.ts

@@ -840,6 +840,14 @@
             <source>Capture</source>
             <translation>截圖</translation>
         </message>
+        <message>
+            <source>Screenshot Folder</source>
+            <translation>截圖目錄</translation>
+        </message>
+        <message>
+            <source>Log Folder</source>
+            <translation>日誌目錄</translation>
+        </message>
     </context>
     <context>
         <name>TaskButtons</name>