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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.129
+Version: 1.0.131
 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.131}/ok/device/interaction_methods/post_message.py

@@ -70,10 +70,10 @@ class PostMessageInteraction(BaseInteraction):
                       ord(c), 0)
             time.sleep(0.01)
 
-    def move(self, x, y, down_btn=0):
-        long_pos = self.update_mouse_pos(x, y, True)
-        self.post(win32con.WM_MOUSEMOVE, down_btn, long_pos)
-        return long_pos
+    def move(self, x, y, down_btn=0):
+        long_pos = self.update_mouse_pos(x, y, True)
+        self.post(win32con.WM_MOUSEMOVE, down_btn, long_pos)
+        return long_pos
 
     def scroll(self, x, y, scroll_amount):
         self.try_activate()
@@ -137,14 +137,14 @@ class PostMessageInteraction(BaseInteraction):
             self.activate(current_hwnd)
 
     def click(self, x=-1, y=-1, move_back=False, name=None, down_time=0.01, move=True, key="left"):
-        super().click(x, y, name=name)
-        if move:
-            long_position = self.move(x, y)
-            time.sleep(down_time)
-        else:
-            long_position = self.update_mouse_pos(x, y, activate=True)
-
-        if key == "left":
+        super().click(x, y, name=name)
+        if move:
+            long_position = self.move(x, y)
+            time.sleep(down_time)
+        else:
+            long_position = self.update_mouse_pos(x, y, activate=True)
+
+        if key == "left":
             btn_down = win32con.WM_LBUTTONDOWN
             btn_mk = win32con.MK_LBUTTON
             btn_up = win32con.WM_LBUTTONUP
@@ -193,42 +193,42 @@ class PostMessageInteraction(BaseInteraction):
             x, y = self.hwnd_window.get_top_window_cords(x, y)
             self.bg_mouse_pos = (x, y)
 
-        try:
-            abs_x, abs_y = win32gui.ClientToScreen(base_hwnd, (int(x), int(y)))
-
-            target_hwnd = base_hwnd
-            hwnds = getattr(self.hwnd_window, 'hwnds', [])
-            for hwnd_info in hwnds:
-                candidate = hwnd_info[0]
-                if not win32gui.IsWindow(candidate):
-                    continue
-                try:
-                    left = hwnd_info[4]
-                    top = hwnd_info[5]
-                    right = left + hwnd_info[2]
-                    bottom = top + hwnd_info[3]
-                    if left <= abs_x < right and top <= abs_y < bottom:
-                        target_hwnd = candidate
-                        break
-                except Exception:
-                    continue
-            self._dynamic_target_hwnd = target_hwnd
-
-            local_x, local_y = win32gui.ScreenToClient(target_hwnd, (abs_x, abs_y))
-
-            hwnd_descriptions = []
-            for index, hwnd_info in enumerate(hwnds):
-                candidate = hwnd_info[0]
-                try:
-                    class_name = win32gui.GetClassName(candidate) if win32gui.IsWindow(candidate) else '<invalid>'
-                except Exception as e:
-                    class_name = f'<class error: {e}>'
-                hwnd_descriptions.append(f'{index}:{candidate}({class_name})')
-            logger.debug(
-                f'hwnd_window hwnds hwnd={self.hwnd_window.hwnd} top_hwnd={self.hwnd_window.top_hwnd}: {hwnd_descriptions}')
-            logger.debug(
-                f'mouse_pos dynamically aimed at {target_hwnd} ({win32gui.GetClassName(target_hwnd)}): {local_x}, {local_y}')
-            return win32api.MAKELONG(local_x, local_y)
+        try:
+            abs_x, abs_y = win32gui.ClientToScreen(base_hwnd, (int(x), int(y)))
+
+            target_hwnd = base_hwnd
+            hwnds = getattr(self.hwnd_window, 'hwnds', [])
+            for hwnd_info in hwnds:
+                candidate = hwnd_info[0]
+                if not win32gui.IsWindow(candidate):
+                    continue
+                try:
+                    left = hwnd_info[4]
+                    top = hwnd_info[5]
+                    right = left + hwnd_info[2]
+                    bottom = top + hwnd_info[3]
+                    if left <= abs_x < right and top <= abs_y < bottom:
+                        target_hwnd = candidate
+                        break
+                except Exception:
+                    continue
+            self._dynamic_target_hwnd = target_hwnd
+
+            local_x, local_y = win32gui.ScreenToClient(target_hwnd, (abs_x, abs_y))
+
+            hwnd_descriptions = []
+            for index, hwnd_info in enumerate(hwnds):
+                candidate = hwnd_info[0]
+                try:
+                    class_name = win32gui.GetClassName(candidate) if win32gui.IsWindow(candidate) else '<invalid>'
+                except Exception as e:
+                    class_name = f'<class error: {e}>'
+                hwnd_descriptions.append(f'{index}:{candidate}({class_name})')
+            # logger.debug(
+            #     f'hwnd_window hwnds hwnd={self.hwnd_window.hwnd} top_hwnd={self.hwnd_window.top_hwnd}: {hwnd_descriptions}')
+            # logger.debug(
+            #     f'mouse_pos dynamically aimed at {target_hwnd} ({win32gui.GetClassName(target_hwnd)}): {local_x}, {local_y}')
+            return win32api.MAKELONG(local_x, local_y)
 
         except Exception as e:
             logger.error(f'update_mouse_pos conversion error targeting {base_hwnd}', e)

{ok_script-1.0.129 → ok_script-1.0.131}/ok/gui/MainWindow.py

@@ -107,13 +107,20 @@ class MainWindow(FluentWindow):
         from ok import og
         self.imported_tabs = {}  # {file_name: tab_object}
         
-        visible_onetime_tasks = [task for task in self.executor.onetime_tasks if getattr(task, 'visible', True)]
-        visible_trigger_tasks = [task for task in self.executor.trigger_tasks if getattr(task, 'visible', True)]
-
-        if visible_onetime_tasks:
-            from ok.gui.tasks.OneTimeTaskTab import OneTimeTaskTab
-            from collections import defaultdict
-
+        visible_onetime_tasks = [task for task in self.executor.onetime_tasks if getattr(task, 'visible', True)]
+        visible_trigger_tasks = [task for task in self.executor.trigger_tasks if getattr(task, 'visible', True)]
+
+        if len(visible_trigger_tasks) > 0:
+            from ok.gui.tasks.TriggerTaskTab import TriggerTaskTab
+            self.trigger_tab = TriggerTaskTab()
+            if self.first_task_tab is None:
+                self.first_task_tab = self.trigger_tab
+            self.addSubInterface(self.trigger_tab, FluentIcon.STOP_WATCH, self.tr('Triggers'))
+
+        if visible_onetime_tasks:
+            from ok.gui.tasks.OneTimeTaskTab import OneTimeTaskTab
+            from collections import defaultdict
+
             groups = defaultdict(list)
             standalone_tasks = []
             for task in visible_onetime_tasks:
@@ -136,19 +143,12 @@ class MainWindow(FluentWindow):
                 if self.first_task_tab is None:
                     self.first_task_tab = group_tab
                 logger.debug(f"add grouped_task_tabs {group_name} len {len(tasks_in_group)}")
-                self.addSubInterface(group_tab, group_icon, self.app.tr(group_name))
-                self.grouped_task_tabs.append(group_tab)
-
-        if len(visible_trigger_tasks) > 0:
-            from ok.gui.tasks.TriggerTaskTab import TriggerTaskTab
-            self.trigger_tab = TriggerTaskTab()
-            if self.first_task_tab is None:
-                self.first_task_tab = self.trigger_tab
-            self.addSubInterface(self.trigger_tab, FluentIcon.ROBOT, self.tr('Triggers'))
-
-        # Add custom tabs that should appear after built-in task tabs
-        for tab_obj in after_custom_tabs:
-            self.addSubInterface(tab_obj, tab_obj.icon, tab_obj.name, position=tab_obj.position)
+                self.addSubInterface(group_tab, group_icon, self.app.tr(group_name))
+                self.grouped_task_tabs.append(group_tab)
+
+        # Add custom tabs that should appear after built-in task tabs
+        for tab_obj in after_custom_tabs:
+            self.addSubInterface(tab_obj, tab_obj.icon, tab_obj.name, position=tab_obj.position)
         if debug:
             from ok.gui.debug.DebugTab import DebugTab
             debug_tab = DebugTab(config, exit_event)

{ok_script-1.0.129 → ok_script-1.0.131}/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.131}/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.131}/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.131}/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.131}/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.131}/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.131}/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>