ok-script 0.0.36__tar.gz → 0.0.38__tar.gz

{ok-script-0.0.36 → ok-script-0.0.38}/PKG-INFO

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

{ok-script-0.0.36 → ok-script-0.0.38}/ok/OK.py

@@ -8,6 +8,7 @@ from PySide6.QtWidgets import QApplication
 import ok
 from ok.logging.Logger import get_logger, config_logger
 from ok.util.exit_event import ExitEvent
+from ok.util.path import install_path_isascii
 
 logger = get_logger(__name__)
 
@@ -49,8 +50,8 @@ class OK:
     def start(self):
         try:
             if self.config.get("use_gui"):
-                self.do_init()
-                self.app.show_main_window()
+                if self.do_init():
+                    self.app.show_main_window()
                 self.app.exec()
             else:
                 self.task_executor.start()
@@ -80,11 +81,15 @@ class OK:
             logger.error("start error", e)
             self.exit_event.set()
             if self.app:
-                self.app.quit()
+                self.quit()
 
     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
             self.ocr = RapidOCR()
 
@@ -109,6 +114,8 @@ class OK:
         if self.app:
             ok.gui.executor = self.task_executor
 
+        return True
+
     def wait_task(self):
         while not self.exit_event.is_set():
             time.sleep(1)
@@ -117,6 +124,8 @@ class OK:
         logger.debug('quit app')
         self.exit_event.set()
         self.device_manager.stop()
+        if self.app:
+            self.app.quit()
 
     def init_device_manager(self):
         if self.device_manager is None:

{ok-script-0.0.36 → ok-script-0.0.38}/ok/capture/BaseCaptureMethod.py

@@ -1,8 +1,10 @@
 import numpy as np
 
+
 class CaptureException(Exception):
     pass
 
+
 class BaseCaptureMethod:
     name = "None"
     description = ""
@@ -13,6 +15,7 @@ class BaseCaptureMethod:
     right_cut = 0
     width = 0
     height = 0
+    _size = (0, 0)
 
     def __init__(self):
         # Some capture methods don't need an initialization process

{ok-script-0.0.36 → ok-script-0.0.38}/ok/capture/adb/ADBCaptureMethod.py

@@ -1,7 +1,6 @@
 # original https://github.com/Toufool/AutoSplit/blob/master/src/capture_method/WindowsGraphicsCaptureMethod.py
 import cv2
 import numpy as np
-from adbutils import AdbError
 from typing_extensions import override
 
 from ok.capture.BaseCaptureMethod import BaseCaptureMethod
@@ -14,12 +13,11 @@ class ADBCaptureMethod(BaseCaptureMethod):
     name = "ADB command line Capture"
     description = "use the adb screencap command, slow but works when in background/minimized, takes 300ms per frame"
 
-    def __init__(self, device, exit_event, width=0, height=0):
+    def __init__(self, device_manager, exit_event, width=0, height=0):
         super().__init__()
         self.exit_event = exit_event
-        self._size = (width, height)
         self._connected = (width != 0 and height != 0)
-        self.device = device
+        self.device_manager = device_manager
 
     @property
     def width(self):
@@ -40,7 +38,7 @@ class ADBCaptureMethod(BaseCaptureMethod):
     def screencap(self):
         if self.exit_event.is_set():
             return None
-        frame = do_screencap(self.device)
+        frame = do_screencap(self.device_manager)
         if frame is not None:
             height, width, _ = frame.shape
             self._connected = True
@@ -50,21 +48,17 @@ class ADBCaptureMethod(BaseCaptureMethod):
         return frame
 
     def connected(self):
-        if not self._connected and self.device is not None:
+        if not self._connected and self.device_manager.device is not None:
             self.screencap()
-        return self._connected and self.device is not None
+        return self._connected and self.device_manager.device is not None
 
 
-def do_screencap(device) -> np.ndarray | None:
-    if device is not None:
-        try:
-            png_bytes = device.shell("screencap -p", encoding=None)
-            if png_bytes is not None and len(png_bytes) > 0:
-                image_data = np.frombuffer(png_bytes, dtype=np.uint8)
-                image = cv2.imdecode(image_data, cv2.IMREAD_COLOR)
-                if image is not None:
-                    return image
-                else:
-                    logger.error(f"Screencap image decode error, probably disconnected")
-        except AdbError as e:
-            logger.error(f"Device {device} error", e)
+def do_screencap(device_manager) -> np.ndarray | None:
+    png_bytes = device_manager.shell("screencap -p", encoding=None)
+    if png_bytes is not None and len(png_bytes) > 0:
+        image_data = np.frombuffer(png_bytes, dtype=np.uint8)
+        image = cv2.imdecode(image_data, cv2.IMREAD_COLOR)
+        if image is not None:
+            return image
+        else:
+            logger.error(f"Screencap image decode error, probably disconnected")

{ok-script-0.0.36 → ok-script-0.0.38}/ok/capture/adb/DeviceManager.py

@@ -2,6 +2,7 @@ import threading
 
 import adbutils
 import win32gui
+from adbutils import AdbError
 
 from ok.capture.HwndWindow import HwndWindow, find_hwnd_by_title_and_exe
 from ok.capture.adb.ADBCaptureMethod import ADBCaptureMethod, do_screencap
@@ -217,7 +218,7 @@ class DeviceManager:
             elif not isinstance(self.capture_method, ADBCaptureMethod):
                 if self.capture_method is not None:
                     self.capture_method.close()
-                self.capture_method = ADBCaptureMethod(self._device, self.exit_event, width=width,
+                self.capture_method = ADBCaptureMethod(self, self.exit_event, width=width,
                                                        height=height)
             self.interaction = ADBBaseInteraction(self, self.capture_method, width, height)
             if self.debug and hwnd_name:
@@ -255,5 +256,10 @@ class DeviceManager:
         if device is not None:
             try:
                 return device.shell(*args, **kwargs)
-            except Exception as e:
-                logger.error(f"shell_wrapper error occurred: {e}")
+            except AdbError as e:
+                addr = self.get_preferred_device()['address']
+                self.adb.connect(addr)
+                logger.error(f"shell_wrapper error occurred: {e} ,try reconnect {addr}")
+                return device.shell(*args, **kwargs)
+        else:
+            raise Exception('Device is none')

{ok-script-0.0.36 → ok-script-0.0.38}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -43,6 +43,7 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
     def __init__(self, hwnd_window: HwndWindow):
         super().__init__()
         self.hwnd_window = hwnd_window
+        self.start_or_stop()
 
     def frame_arrived_callback(self, x, y):
         try:
@@ -180,9 +181,7 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
             self.last_frame = None
             latency = time.time() - self.last_frame_time
             self.last_frame_time = time.time()
-            if latency > 1:
-                logger.warning(f"latency too large return None frame: {latency}")
-                return None
+
             if frame is not None:
                 x, y = self.hwnd_window.get_top_left_frame_offset()
                 if x > 0 or y > 0:
@@ -194,11 +193,26 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
                     logger.warning(f"get_frame size <=0 {new_width}x{new_height}")
                     frame = None
                 else:
-                    self.width = new_width
-                    self.height = new_height
+                    self._size = (new_width, new_height)
                     if frame.shape[2] == 4:
                         frame = frame[:, :, :3]
-            return frame
+            if latency > 1:
+                logger.warning(f"latency too large return None frame: {latency}")
+                return None
+            else:
+                return frame
+
+    @property
+    def width(self):
+        if self._size[0] == 0:
+            self.do_get_frame()
+        return self._size[0]
+
+    @property
+    def height(self):
+        if self._size[1] == 0:
+            self.do_get_frame()
+        return self._size[1]
 
     def reset_framepool(self, size, reset_device=False):
         if reset_device:

{ok-script-0.0.36 → ok-script-0.0.38}/ok/gui/App.py

@@ -9,6 +9,7 @@ from qfluentwidgets import FluentTranslator, qconfig, Theme
 import ok
 import ok.gui.resources
 from ok.gui.MainWindow import MainWindow
+from ok.gui.MessageWindow import MessageWindow
 from ok.gui.i18n.path import i18n_path
 from ok.gui.overlay.OverlayWindow import OverlayWindow
 from ok.logging.Logger import get_logger
@@ -60,9 +61,18 @@ class App:
         # Calculate half the screen size
         half_screen_width = size.width() / 2
         half_screen_height = size.height() / 2
-
         window.move(half_screen_width / 2, half_screen_height / 2)
 
+    def show_message_window(self, title, message):
+        message_window = MessageWindow(self.icon, title, message, exit_event=self.exit_event)
+        message_window.show()
+
+    def show_path_ascii_error(self, path):
+        title = self.app.tr('Error')
+        content = self.app.tr(
+            "Install dir ") + path + self.app.tr(" must be an English path, move to another path.")
+        self.show_message_window(title, content)
+
     def show_main_window(self):
         self.main_window = MainWindow(self.icon, self.overlay, self.about, exit_event=self.exit_event)
         self.main_window.setWindowTitle(f'{self.title} {self.version}')  # Set the window title here
@@ -92,3 +102,6 @@ class App:
 
     def exec(self):
         sys.exit(self.app.exec())
+
+    def quit(self):
+        self.app.quit()

ok-script-0.0.38/ok/gui/MessageWindow.py

@@ -0,0 +1,45 @@
+import sys
+
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QVBoxLayout
+from qfluentwidgets import BodyLabel, PushButton
+from qframelesswindow import FramelessWindow, StandardTitleBar
+
+import ok.gui
+from ok.gui.common.style_sheet import StyleSheet
+from ok.logging.Logger import get_logger
+
+logger = get_logger(__name__)
+
+
+class MessageWindow(FramelessWindow):
+    def __init__(self, icon, title, message, exit_event=None):
+        super().__init__()
+        self.exit_event = exit_event
+        self.message = message
+        self.title_bar = StandardTitleBar(self)
+        self.title_bar.maxBtn.hide()
+        self.title_bar.minBtn.hide()
+        self.setTitleBar(self.title_bar)
+        self.setFixedSize(500, 200)
+        self.setWindowTitle(title)
+        self.setWindowIcon(icon)
+        self.message_label = BodyLabel(message)
+        self.message_label.setWordWrap(True)
+        self.vBoxLayout = QVBoxLayout(self)
+        self.setLayout(self.vBoxLayout)
+        self.vBoxLayout.addWidget(self.message_label, 0, 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)
+        self.confirm_button.setMaximumWidth(150)
+
+        StyleSheet.MESSAGE_WINDOW.apply(self)
+        self.activateWindow()
+
+    def closeEvent(self, event):
+        ok.gui.ok.quit()
+        event.accept()
+
+    def quit(self):
+        ok.gui.ok.quit()

{ok-script-0.0.36 → ok-script-0.0.38}/ok/gui/common/style_sheet.py

@@ -10,13 +10,8 @@ class StyleSheet(StyleSheetBase, Enum):
     LINK_CARD = "link_card"
     CARD = "card"
     STATUS_BAR = "status_bar"
-    HOME_INTERFACE = "home_interface"
-    ICON_INTERFACE = "icon_interface"
-    VIEW_INTERFACE = "view_interface"
-    SETTING_INTERFACE = "setting_interface"
     TAB = "tab"
-    GALLERY_INTERFACE = "gallery_interface"
-    NAVIGATION_VIEW_INTERFACE = "navigation_view_interface"
+    MESSAGE_WINDOW = "message_window"
 
     def path(self, theme=Theme.AUTO):
         theme = qconfig.theme if theme == Theme.AUTO else theme