ok-script 0.0.77__tar.gz → 0.0.79__tar.gz

{ok-script-0.0.77 → ok-script-0.0.79}/PKG-INFO

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

{ok-script-0.0.77 → ok-script-0.0.79}/ok/OK.py

@@ -11,7 +11,6 @@ from ok.util.exit_event import ExitEvent
 from ok.util.path import install_path_isascii
 from ok.util.win32_process import check_mutex
 
-check_mutex()
 logger = get_logger(__name__)
 
 
@@ -27,6 +26,7 @@ class OK:
     app = None
     screenshot = None
     exit_event = ExitEvent()
+    init_error = None
 
     def __init__(self, config: Dict[str, Any]):
         print(f"AutoHelper init, config: {config}")
@@ -57,7 +57,8 @@ class OK:
     def start(self):
         try:
             if self.config.get("use_gui"):
-                self.app.show_main_window()
+                if not self.init_error:
+                    self.app.show_main_window()
                 self.app.exec()
             else:
                 self.task_executor.start()
@@ -91,14 +92,6 @@ class OK:
 
     def do_init(self):
         logger.info(f"initializing {self.__class__.__name__}, config: {self.config}")
-        if self.config.get('ocr'):
-            isascii, path = install_path_isascii()
-            if not isascii:
-                self.app.show_path_ascii_error(path)
-                return False
-            from rapidocr_openvino import RapidOCR
-            inference_num_threads = self.config.get('ocr').get('inference_num_threads', -1)
-            self.ocr = RapidOCR(inference_num_threads=inference_num_threads)
 
         template_matching = self.config.get('template_matching')
         if template_matching is not None:
@@ -117,10 +110,25 @@ class OK:
                                           trigger_tasks=self.config.get('trigger_tasks', []),
                                           scenes=self.config['scenes'],
                                           feature_set=self.feature_set,
-                                          ocr=self.ocr, config_folder=self.config.get("config_folder"))
+                                          config_folder=self.config.get("config_folder"))
 
         ok.gui.executor = self.task_executor
 
+        if self.config.get('ocr'):
+            isascii, path = install_path_isascii()
+            if not isascii:
+                self.app.show_path_ascii_error(path)
+                self.init_error = True
+                return False
+            from rapidocr_openvino import RapidOCR
+            inference_num_threads = self.config.get('ocr').get('inference_num_threads', -1)
+            self.ocr = RapidOCR(inference_num_threads=inference_num_threads)
+            self.task_executor.ocr = self.ocr
+
+        if not check_mutex():
+            self.init_error = True
+            self.app.show_already_running_error()
+
         return True
 
     def wait_task(self):

{ok-script-0.0.77 → ok-script-0.0.79}/ok/alas/platform_windows.py

@@ -44,6 +44,8 @@ def get_emulator_exe(instance: EmulatorInstance):
     elif instance == Emulator.BlueStacks4:
         # BlueStacks\Client\Bluestacks.exe -vmname Android_1
         return f'"{exe}" -vmname {instance.name}'
+    elif instance == Emulator.LDPlayerFamily:
+        return f'"{exe}" -name {instance.name}'
     else:
         raise EmulatorUnknown(f'Cannot start an unknown emulator instance: {instance}')
 

{ok-script-0.0.77 → ok-script-0.0.79}/ok/capture/adb/DeviceManager.py

@@ -55,6 +55,9 @@ class DeviceManager:
     def adb_connect(self, addr):
         try:
             for info in self.adb.list():
+                if self.exit_event.is_set():
+                    logger.error(f"adb_connect exit_event is set")
+                    return None
                 if info.serial == addr:
                     if info.state == 'offline':
                         logger.debug(f'adb_connect offline disconnect first {addr}')
@@ -185,7 +188,7 @@ class DeviceManager:
         if self.config.get("preferred") != imei:
             logger.info(f'preferred device did change {imei}')
             self.config["preferred"] = imei
-            self.handler.post(self.start, remove_existing=True, skip_if_running=True)
+            self.start()
         logger.debug(f'preferred device: {preferred}')
 
     def adb_get_imei(self, device):
@@ -215,7 +218,7 @@ class DeviceManager:
     def set_capture(self, capture):
         if self.config.get("capture") != capture:
             self.config['capture'] = capture
-            self.handler.post(self.start, remove_existing=True, skip_if_running=True)
+            self.start()
 
     def get_hwnd_name(self):
         preferred = self.get_preferred_device()
@@ -280,7 +283,7 @@ class DeviceManager:
         communicate.adb_devices.emit(True)
 
     def update_resolution_for_hwnd(self):
-        if self.hwnd is not None and self.hwnd.frame_aspect_ratio == 0:
+        if self.hwnd is not None and self.hwnd.frame_aspect_ratio == 0 and self.adb_capture_config:
             width, height = self.get_resolution()
             logger.debug(f'update resolution for {self.hwnd} {width}x{height}')
             self.hwnd.update_frame_size(width, height)
@@ -372,7 +375,7 @@ class DeviceManager:
                 packages = [packages]
             for package in packages:
                 if package == front.package:
-                    return False
+                    return True
 
     def adb_start_package(self, package):
         self.shell(f'monkey -p {package} -c android.intent.category.LAUNCHER 1')

{ok-script-0.0.77 → ok-script-0.0.79}/ok/feature/FeatureSet.py

@@ -105,7 +105,8 @@ class FeatureSet:
                 self.feature_dict[category_name] = Feature(image, x, y, w, h)
             self.box_dict[category_name] = Box(x, y, w, h, name=category_name)
 
-    def get_box_by_name(self, category_name: str) -> Box:
+    def get_box_by_name(self, mat, category_name: str) -> Box:
+        self.check_size(mat)
         if category_name in self.box_dict:
             return self.box_dict[category_name]
         else:

{ok-script-0.0.77 → ok-script-0.0.79}/ok/feature/FindFeature.py

@@ -18,7 +18,7 @@ class FindFeature:
                                              threshold, use_gray_scale, x, y, to_x, to_y, width, height)
 
     def get_box_by_name(self, name):
-        return self.feature_set.get_box_by_name(name)
+        return self.feature_set.get_box_by_name(self.executor.frame, name)
 
     def find_feature_and_set(self, features, horizontal_variance=0, vertical_variance=0, threshold=0):
         ret = True

{ok-script-0.0.77 → ok-script-0.0.79}/ok/gui/App.py

@@ -79,6 +79,12 @@ class App:
         message_window = MessageWindow(self.icon, title, message, exit_event=self.exit_event)
         message_window.show()
 
+    def show_already_running_error(self):
+        title = QCoreApplication.translate("app", 'Error')
+        content = QCoreApplication.translate("app",
+                                             "Another instance is already running")
+        self.show_message_window(title, content)
+
     def show_path_ascii_error(self, path):
         title = QCoreApplication.translate("app", 'Error')
         content = QCoreApplication.translate("app",

{ok-script-0.0.77 → ok-script-0.0.79}/ok/gui/MainWindow.py

@@ -2,12 +2,10 @@ import os
 import sys
 
 from PySide6.QtCore import QObject, Signal, Qt
-from PySide6.QtGui import QKeySequence, QShortcut
 from PySide6.QtWidgets import QMenu, QSystemTrayIcon
 from qfluentwidgets import FluentIcon, NavigationItemPosition, MSFluentWindow, InfoBar, InfoBarPosition, MessageBox
 
 import ok.gui
-from ok.capture.windows.dump import dump_threads
 from ok.gui.Communicate import communicate
 from ok.gui.about.AboutTab import AboutTab
 from ok.gui.debug.DebugTab import DebugTab
@@ -68,8 +66,6 @@ class MainWindow(MSFluentWindow):
         communicate.executor_paused.connect(self.executor_paused)
         communicate.tab.connect(self.navigate_tab)
 
-      
-
         # Create a context menu for the tray
         menu = QMenu()
         exit_action = menu.addAction(self.tr("Exit"))
@@ -167,10 +163,11 @@ class MainWindow(MSFluentWindow):
     def closeEvent(self, event):
         # Create a message box that asks the user if they really want to close the window
         if sys.platform == 'win32' and 'shutdown' in os.environ.get('SESSIONNAME', '').lower():
+            logger.info("system shutting down")
+            ok.gui.ok.quit()
             event.accept()
             return
 
-            # Your existing code for the message box
         if ok.gui.ok.exit_event.is_set():
             event.accept()
             return

{ok-script-0.0.77 → ok-script-0.0.79}/ok/gui/MessageWindow.py

@@ -27,8 +27,9 @@ class MessageWindow(FramelessWindow):
         self.message_label = BodyLabel(message)
         self.message_label.setWordWrap(True)
         self.vBoxLayout = QVBoxLayout(self)
+        self.vBoxLayout.setAlignment(Qt.AlignCenter)
         self.setLayout(self.vBoxLayout)
-        self.vBoxLayout.addWidget(self.message_label, 0, Qt.AlignVCenter)
+        self.vBoxLayout.addWidget(self.message_label, 1, Qt.AlignVCenter)
         self.confirm_button = PushButton(self.tr('Confirm'))
         self.vBoxLayout.addWidget(self.confirm_button, 0, Qt.AlignCenter)
         self.confirm_button.clicked.connect(self.quit)

{ok-script-0.0.77 → ok-script-0.0.79}/ok/gui/debug/DebugTab.py

@@ -1,9 +1,8 @@
 import subprocess
 from ctypes import windll, wintypes
 
-from PySide6.QtCore import Qt, Signal, QEvent
-from PySide6.QtGui import QShortcut, QKeySequence
-from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout, QMessageBox
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout
 from _ctypes import byref
 from qfluentwidgets import PushButton, FlowLayout, ComboBox, SearchLineEdit, TextEdit
 
@@ -110,6 +109,7 @@ class DebugTab(Tab):
             if msg.message == 0x0312:  # WM_HOTKEY
                 logger.debug(f'hotkey pressed {msg}')
                 if msg.wParam == 1:
+                    logger.debug('dumping threads')
                     dump_threads()
                 elif msg.wParam == 2:
                     self.handler.post(self.capture)
@@ -124,9 +124,9 @@ class DebugTab(Tab):
         VK_S = 0x53
 
         if not windll.user32.RegisterHotKey(None, 1, MOD_ALT | MOD_CONTROL, VK_D):
-            print("Failed to register hotkey for Alt+Ctrl+D")
+            logger.debug("Failed to register hotkey for Alt+Ctrl+D")
         if not windll.user32.RegisterHotKey(None, 2, MOD_ALT | MOD_CONTROL, VK_S):
-            print("Failed to register hotkey for Alt+Ctrl+S")
+            logger.debug("Failed to register hotkey for Alt+Ctrl+S")
         logger.debug('bind_hot_keys')
 
     def __del__(self):

{ok-script-0.0.77 → ok-script-0.0.79}/ok/gui/start/StartTab.py

@@ -82,6 +82,8 @@ class StartTab(Tab):
         preferred = ok.gui.device_manager.config.get("preferred")
         selected = self.device_list_row
 
+        logger.debug('update_capture')
+
         # Update the existing items in the device_list and ok.gui.device_manager.get_devices()
         for row, device in enumerate(devices):
             if device["imei"] == preferred:

{ok-script-0.0.77 → ok-script-0.0.79}/ok/task/BaseTask.py

@@ -1,8 +1,11 @@
+import threading
+
 from ok.config.Config import Config
 from ok.config.InfoDict import InfoDict
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
 from ok.task.ExecutorOperation import ExecutorOperation
+from ok.util.Handler import Handler
 
 logger = get_logger(__name__)
 
@@ -22,6 +25,15 @@ class BaseTask(ExecutorOperation):
         self.config_description = {}
         self.config_type = {}
         self._paused = False
+        self.lock = threading.Lock()
+        self._handler = None
+
+    @property
+    def handler(self) -> Handler:
+        with self.lock:
+            if self._handler is None:
+                self._handler = Handler(self.executor.exit_event, __name__)
+            return self._handler
 
     def pause(self):
         self.executor.pause(self)

{ok-script-0.0.77 → ok-script-0.0.79}/ok/task/ExecutorOperation.py

@@ -1,6 +1,7 @@
 import queue
 from typing import List
 
+from ok.color.Color import calculate_color_percentage
 from ok.feature.Box import Box, find_box_by_name, relative_box
 from ok.gui.Communicate import communicate
 
@@ -163,5 +164,11 @@ class ExecutorOperation:
     def draw_boxes(feature_name=None, boxes=None, color="red"):
         communicate.emit_draw_box(feature_name, boxes, color)
 
+    def calculate_color_percentage(self, color, box: Box):
+        percentage = calculate_color_percentage(self.frame, color, box)
+        box.confidence = percentage
+        self.draw_boxes(box.name, box)
+        return percentage
+
     def adb_shell(self, *args, **kwargs):
         return self.executor.device_manager.shell(*args, **kwargs)

{ok-script-0.0.77 → ok-script-0.0.79}/ok/task/TaskExecutor.py

@@ -10,7 +10,6 @@ from ok.scene.Scene import Scene
 from ok.stats.StreamStats import StreamStats
 from ok.task.OneTimeTask import OneTimeTask
 from ok.task.TriggerTask import TriggerTask
-from ok.util.exit_event import ExitEvent
 
 logger = get_logger(__name__)
 
@@ -35,7 +34,7 @@ class TaskExecutor:
 
     def __init__(self, device_manager: DeviceManager,
                  wait_until_timeout=10, wait_until_before_delay=1, wait_until_check_delay=1,
-                 exit_event=ExitEvent(), trigger_tasks=[], onetime_tasks=[], scenes=[], feature_set=None,
+                 exit_event=None, trigger_tasks=[], onetime_tasks=[], scenes=[], feature_set=None,
                  ocr=None,
                  config_folder=None):
         self.device_manager = device_manager

{ok-script-0.0.77 → ok-script-0.0.79}/ok/update/GithubMultiDownloader.py

@@ -55,13 +55,14 @@ class GithubMultiDownloader:
                 downloaded = os.path.getsize(file)
                 if downloaded == part_size:
                     logger.info(f'File {file} already downloaded')
+                    self.downloaded += part_size
                     return
                 elif downloaded > part_size:
                     logger.warning(f'File size error {file} {downloaded} > {part_size}')
                     os.remove(file)
                 else:
                     part_start += downloaded
-                self.downloaded += part_size
+                    self.downloaded += downloaded
 
         target_size = end - part_start + 1
 
@@ -117,6 +118,12 @@ class GithubMultiDownloader:
                             response.close()
                             logger.debug('switch to fast proxy')
                             break
+                if part_downloaded == target_size:
+                    logger.debug("download_part finished")
+                    return
+                else:
+                    logger.warning(f'download_part size failed {part_downloaded} {target_size}')
+                return True
         except Exception as e:
             with self.lock:
                 if proxy in self.proxys:

{ok-script-0.0.77 → ok-script-0.0.79}/ok/util/Handler.py

@@ -31,33 +31,40 @@ class Handler:
                 while not self.task_queue:
                     self.condition.wait()
 
-                now = time.time()
-                while self.task_queue and self.task_queue[0].execute_at <= now:
-                    scheduled_task = heapq.heappop(self.task_queue)
-                    if scheduled_task.task is None:
-                        logger.debug(f'stopping handler {self.thread.name}')
-                        return
-                    self.executing = scheduled_task.task
-                    try:
-                        scheduled_task.task()
-                    except Exception as e:
-                        logger.error(f'handler {self.thread.name} raised exception', e)
-                    self.executing = None
-
+            now = time.time()
+            self.condition.acquire()
+            if self.task_queue and self.task_queue[0].execute_at <= now:
+                scheduled_task = heapq.heappop(self.task_queue)
+                self.condition.release()
+                if scheduled_task.task is None:
+                    logger.debug(f'stopping handler {self.thread.name}')
+                    return
+                self.executing = scheduled_task.task
+                try:
+                    scheduled_task.task()
+                except Exception as e:
+                    logger.error(f'handler {self.thread.name} raised exception', e)
+                self.executing = None
+            else:
                 if self.task_queue:
                     next_time = self.task_queue[0].execute_at
                     timeout = next_time - now
                     if timeout > 0:
                         self.condition.wait(timeout=timeout)
+                self.condition.release()
 
     def post(self, task, delay=0, remove_existing=False, skip_if_running=False):
         with self.condition:
+            if self.exit_event.is_set():
+                logger.error(f'post handler {self.thread.name} already exits')
+                self.condition.notify_all()
+                return
             if remove_existing and len(self.task_queue) > 0:
                 for obj in self.task_queue.copy():
                     if obj.task == task:
                         self.task_queue.remove(obj)
                         logger.debug(f'removing duplicate task {task}')
-            if remove_existing and self.executing == task:
+            if skip_if_running and self.executing == task:
                 logger.debug(f'skipping duplicate task {task}')
                 return
             if delay > 0:
@@ -65,36 +72,9 @@ class Handler:
             else:
                 scheduled_task = ScheduledTask(0, task)
             heapq.heappush(self.task_queue, scheduled_task)
-            self.condition.notify()
+            self.condition.notify_all()
 
     def stop(self):
-        heapq.heappush(self.task_queue, ScheduledTask(0, None))
         with self.condition:
+            heapq.heappush(self.task_queue, ScheduledTask(0, None))
             self.condition.notify_all()
-
-
-# Example usage
-if __name__ == "__main__":
-    def print_message(message):
-        from datetime import datetime
-        print(f"{message} at {datetime.now().time()}")
-
-
-    exit_event = ExitEvent()
-    handler = Handler(event=ExitEvent(), name="MyHandlerThread")
-
-    # Post a task to run immediately
-    handler.post(lambda: print_message("Immediate task"))
-
-    # Post a task to run after a delay (e.g., 2 seconds)
-    handler.post_delayed(lambda: print_message("Delayed task"), 2)
-
-    # Post a function to run immediately
-    handler.post(lambda: print_message("Immediate function"))
-
-    # Post a function to run after a delay (e.g., 3 seconds)
-    handler.post_delayed(lambda: print_message("Delayed function"), 3)
-
-    # Let the handler run for a while to process the tasks
-    time.sleep(5)
-    exit_event.set()

{ok-script-0.0.77 → ok-script-0.0.79}/ok/util/exit_event.py

@@ -17,7 +17,7 @@ class ExitEvent(threading.Event):
 
     def set(self):
         super(ExitEvent, self).set()
-        logger.debug(f"ExitEvent set event empty queues")
+        logger.debug(f"ExitEvent set event empty queues {self.queues} to_stops: {self.to_stops}")
         for queue in self.queues:
             queue.put(None)
 

{ok-script-0.0.77 → ok-script-0.0.79}/ok/util/win32_process.py

@@ -4,7 +4,6 @@ import ctypes
 import hashlib
 import msvcrt
 import os
-import sys
 from ctypes import wintypes
 from typing import Union
 
@@ -34,7 +33,8 @@ def check_mutex():
     # Check if the mutex already exists
     if GetLastError() == ERROR_ALREADY_EXISTS:
         print(f"Another instance of this application is already running. {path}")
-        sys.exit(0)
+        return False
+    return True
 
 
 def all_pids() -> list[int]:

{ok-script-0.0.77 → ok-script-0.0.79}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.77 → ok-script-0.0.79}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.77",
+    version="0.0.79",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",