ok-script 0.0.69__tar.gz → 0.0.70__tar.gz

{ok-script-0.0.69 → ok-script-0.0.70}/PKG-INFO

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

{ok-script-0.0.69 → ok-script-0.0.70}/ok/OK.py

@@ -34,7 +34,8 @@ class OK:
         config_logger(config)
         logger.info(f"AutoHelper init, config: {config}")
         ok.gui.ok = self
-        self.debug = config.get("debug", False)
+        config['debug'] = config.get("debug", False)
+        self.debug = config['debug']
         try:
             self.config = config
             self.init_device_manager()
@@ -135,9 +136,6 @@ class OK:
     def init_device_manager(self):
         if self.device_manager is None:
             from ok.capture.adb.DeviceManager import DeviceManager
-            self.device_manager = DeviceManager(self.config.get("config_folder") or "config",
-                                                self.config.get('windows'),
-                                                self.config.get('adb'),
-                                                self.config.get("debug"),
+            self.device_manager = DeviceManager(self.config,
                                                 self.exit_event)
             ok.gui.device_manager = self.device_manager

{ok-script-0.0.69 → ok-script-0.0.70}/ok/capture/BaseCaptureMethod.py

@@ -28,7 +28,7 @@ class BaseCaptureMethod:
             try:
                 self.get_frame()
             except Exception as e:
-                logger.error('get frame error')
+                logger.error('width get frame error', e)
         return self._size[0]
 
     @property
@@ -37,7 +37,7 @@ class BaseCaptureMethod:
             try:
                 self.get_frame()
             except Exception as e:
-                logger.error('get frame error')
+                logger.error('height get frame error', e)
         return self._size[1]
 
     def get_frame(self) -> np.ndarray | None:

{ok-script-0.0.69 → ok-script-0.0.70}/ok/capture/HwndWindow.py

@@ -1,5 +1,4 @@
 # original https://github.com/dantmnf & https://github.com/hakaboom/winAuto
-import os.path
 import re
 import threading
 import time
@@ -75,13 +74,13 @@ class HwndWindow:
     def update_frame_size(self, width, height):
         logger.debug(f"update_frame_size:{self.frame_width}x{self.frame_height} to {width}x{height}")
         if width != self.frame_width or height != self.frame_height:
-            self.hwnd = None
             self.frame_width = width
             self.frame_height = height
             if width > 0 and height > 0:
                 self.frame_aspect_ratio = width / height
                 logger.debug(f"HwndWindow: frame ratio: width: {width}, height: {height}")
-            self.do_update_window_size()
+        self.hwnd = None
+        self.do_update_window_size()
 
     def update_window_size(self):
         while not self.app_exit_event.is_set() and not self.stop_event.is_set():
@@ -131,8 +130,8 @@ class HwndWindow:
                     self.x, self.y, self.border, self.title_height, self.width, self.height, self.ext_left_bounds, self.ext_top_bounds = x, y, border, title_height, width, height, ext_left_bounds, ext_top_bounds
                     changed = True
                 if changed:
-                    logger.debug(
-                        f"do_update_window_size changed,visible:{self.visible} x:{self.x} y:{self.y} border:{self.border} width:{self.width} height:{self.height} self.title_height:{self.title_height} scaling:{self.scaling}")
+                    logger.info(
+                        f"do_update_window_size changed,visible:{self.visible} x:{self.x} y:{self.y} border:{self.border} window:{self.width}x{self.height} self.title_height:{self.title_height} real:{self.real_width}x{self.real_height} scaling:{self.scaling}")
                     communicate.window.emit(self.visible, self.x, self.y, self.border, self.title_height, self.width,
                                             self.height, self.scaling)
         except Exception as e:
@@ -185,13 +184,6 @@ def find_hwnd(title, exe_name, frame_width, frame_height):
             from ok.capture.windows.BitBltCaptureMethod import bit_blt_test_hwnd
             if (biggest is None or (result[2] * result[3]) > biggest[2] * biggest[3]) and bit_blt_test_hwnd(result[0]):
                 biggest = result
-        for result in results:
-            if frame_aspect_ratio != 0:
-                ratio = result[2] / result[3]
-                difference = abs(ratio - frame_aspect_ratio)
-                support = difference <= 0.01 * frame_aspect_ratio
-                if support and biggest != result:
-                    ratio_match = result
         x_offset = 0
         y_offset = 0
         real_width, real_height = biggest[2], biggest[3]
@@ -199,7 +191,7 @@ def find_hwnd(title, exe_name, frame_width, frame_height):
             matching_child = enum_child_windows(biggest, frame_aspect_ratio)
             if matching_child is not None:
                 x_offset, y_offset, real_width, real_height = matching_child
-        logger.debug(f'find_hwnd {results} {biggest} {x_offset, y_offset, real_width, real_height}')
+        logger.info(f'find_hwnd {frame_width, frame_height} {biggest} {x_offset, y_offset, real_width, real_height}')
         return biggest[6], biggest[0], biggest[1], x_offset, y_offset, real_width, real_height,
     else:
         return None, None, None, 0, 0, 0, 0
@@ -216,10 +208,10 @@ def enum_child_windows(biggest, frame_aspect_ratio):
         visible = win32gui.IsWindowVisible(hwnd)
         parent = win32gui.GetParent(hwnd)
         rect = win32gui.GetWindowRect(hwnd)
-        logger.debug(f'find_hwnd child_callback {visible} {biggest[0]} {parent} {rect}')
+        real_width = rect[2] - rect[0]
+        real_height = rect[3] - rect[1]
+        logger.info(f'find_hwnd child_callback {visible} {biggest[0]} {parent} {rect} {real_width} {real_height}')
         if visible and parent == biggest[0]:
-            real_width = rect[2] - rect[0]
-            real_height = rect[3] - rect[1]
             ratio = real_width / real_height
             difference = abs(ratio - frame_aspect_ratio)
             support = difference <= 0.01 * frame_aspect_ratio
@@ -244,45 +236,6 @@ def get_exe_by_hwnd(hwnd):
     return process.name(), process.exe()
 
 
-def enum_windows(emulator_path=None):
-    if emulator_path is not None:
-        emulator_path = os.path.normpath(emulator_path)
-
-    def callback(hwnd, extra):
-        name, full_path = get_exe_by_hwnd(hwnd)
-        if emulator_path and emulator_path != full_path:
-            return True
-        buff = win32gui.GetWindowText(hwnd)
-        if buff and win32gui.IsWindowVisible(hwnd):
-            rect = win32gui.GetWindowRect(hwnd)
-            width = rect[2] - rect[0]
-            height = rect[3] - rect[1]
-            extra.append((hwnd, buff, width, height))
-        return True
-
-    windows = []
-    win32gui.EnumWindows(callback, windows)
-    return windows
-
-
-#
-# def enum_child_windows(parent_handle):
-#     """
-#     A function to enumerate all child windows of the given parent window handle
-#     and print their handle and window title.
-#     """
-#
-#     def callback(hwnd, _):
-#         if win32gui.IsWindowVisible(hwnd) and win32gui.GetParent(hwnd) == parent_handle:
-#             rect = win32gui.GetWindowRect(hwnd)
-#             width = rect[2] - rect[0]
-#             height = rect[3] - rect[1]
-#             print(f"Child HWND: {hwnd} - Window Text: {win32gui.GetWindowText(hwnd)} {rect} {width} {height}")
-#         return True
-#
-#     win32gui.EnumChildWindows(parent_handle, callback, None)
-
-
 if __name__ == '__main__':
     print(find_hwnd("MuMu模拟器12", None))
     # hwnd_window = HwndWindow(threading.Event(), None, 'D:\\MuMuPlayer-12.0\\shell\\MuMuPlayer.exe', 16, 9)

{ok-script-0.0.69 → ok-script-0.0.70}/ok/capture/adb/DeviceManager.py

@@ -16,20 +16,25 @@ logger = get_logger(__name__)
 
 class DeviceManager:
 
-    def __init__(self, config_folder, windows_capture_config, adb_capture_config, debug=False, exit_event=None):
+    def __init__(self, app_config, exit_event=None):
         self._device = None
         self._adb = None
-        self.windows_capture_config = windows_capture_config
-        self.adb_capture_config = adb_capture_config
-        self.debug = debug
+        self.supported_ratio = parse_ratio(app_config.get(
+            'supported_screen_ratio'))
+        self.windows_capture_config = app_config.get('windows')
+        self.adb_capture_config = app_config.get('adb')
+        self.debug = app_config.get('debug')
         self.interaction = None
         self.device_dict = {}
         self.exit_event = exit_event
         self.resolution_dict = {}
-        if windows_capture_config is not None:
-            self.hwnd = HwndWindow(exit_event, windows_capture_config.get('title'),
-                                   windows_capture_config.get('exe'))
-        self.config = Config({"preferred": "none", "pc_full_path": "none", 'capture': 'windows'}, config_folder,
+        if self.windows_capture_config is not None:
+            self.hwnd = HwndWindow(exit_event, self.windows_capture_config.get('title'),
+                                   self.windows_capture_config.get('exe'))
+        else:
+            self.hwnd = None
+        self.config = Config({"preferred": "none", "pc_full_path": "none", 'capture': 'windows'},
+                             app_config.get('config_folder'),
                              "devices")
         self.capture_method = None
         self.handler = Handler(exit_event, 'RefreshAdb')
@@ -113,7 +118,7 @@ class DeviceManager:
                         found = True
                         break
                 if not found:
-                    height, width = self.get_resolution(adb_device)
+                    width, height = self.get_resolution(adb_device)
                     logger.debug(f'refresh_phones found an phone {adb_device}')
                     phone_device = {"address": adb_device.serial, "device": "adb", "connected": True, "imei": imei,
                                     "nick": adb_device.prop.model or imei,
@@ -150,8 +155,11 @@ class DeviceManager:
             frame = do_screencap(device)
             if frame is not None:
                 height, width, _ = frame.shape
-                self.resolution_dict[device.serial] = (width, height)
-        return height, width
+                if self.supported_ratio is None or abs(width / height - self.supported_ratio) < 0.01:
+                    self.resolution_dict[device.serial] = (width, height)
+                else:
+                    logger.warning(f'resolution error {device.serial} {self.supported_ratio} {width, height}')
+        return width, height
 
     def set_preferred_device(self, imei=None, index=-1):
         logger.debug(f"set_preferred_device {imei} {index}")
@@ -244,7 +252,7 @@ class DeviceManager:
                 self.interaction = Win32Interaction(self.capture_method)
             preferred['connected'] = self.capture_method.connected()
         else:
-            height, width = self.get_resolution()
+            width, height = self.get_resolution()
             if self.config.get('capture') == "windows":
                 self.ensure_hwnd(None, preferred.get('full_path'), width, height)
                 self.use_windows_capture({'can_bit_blt': True}, require_bg=True, use_bit_blt_only=True)
@@ -271,7 +279,7 @@ class DeviceManager:
 
     def update_resolution_for_hwnd(self):
         if self.hwnd is not None and self.hwnd.frame_aspect_ratio == 0:
-            height, width = self.get_resolution()
+            width, height = self.get_resolution()
             logger.debug(f'update resolution for {self.hwnd} {width}x{height}')
             self.hwnd.update_frame_size(width, height)
 
@@ -375,3 +383,12 @@ class DeviceManager:
         elif installed := self.adb_check_installed(packages):
             self.adb_start_package(installed)
             return True
+
+
+def parse_ratio(ratio_str):
+    if ratio_str:
+        # Split the string into two parts: '16' and '9'
+        numerator, denominator = ratio_str.split(':')
+        # Convert the strings to integers and perform the division
+        ratio_float = int(numerator) / int(denominator)
+        return ratio_float

{ok-script-0.0.69 → ok-script-0.0.70}/ok/capture/windows/BitBltCaptureMethod.py

@@ -40,8 +40,15 @@ class BitBltCaptureMethod(BaseWindowsCaptureMethod):
 
     @override
     def do_get_frame(self) -> MatLike | None:
-        return bit_blt_capture_frame(self.hwnd_window.hwnd, self.hwnd_window.real_x_offset or self.hwnd_window.border,
-                                     self.hwnd_window.real_y_offset or self.hwnd_window.title_height,
+        if self.hwnd_window.real_x_offset != 0 or self.hwnd_window.real_y_offset != 0:
+            x = self.hwnd_window.real_x_offset
+            y = self.hwnd_window.real_y_offset
+        else:
+            x = self.hwnd_window.border
+            y = self.hwnd_window.title_height
+
+        return bit_blt_capture_frame(self.hwnd_window.hwnd, x,
+                                     y,
                                      self.hwnd_window.real_width or self.hwnd_window.width,
                                      self.hwnd_window.real_height or self.hwnd_window.height,
                                      self.hwnd_window.ext_left_bounds, self.hwnd_window.ext_top_bounds)

{ok-script-0.0.69 → ok-script-0.0.70}/ok/task/TaskExecutor.py

@@ -74,12 +74,12 @@ class TaskExecutor:
         return self._frame
 
     def check_frame_and_resolution(self, supported_ratio):
+        self.device_manager.update_resolution_for_hwnd()
         frame = self.method.get_frame()
         if frame is None:
             return False, None
         if supported_ratio is None:
             return True, None
-        self.device_manager.update_resolution_for_hwnd()
         width = self.method.width
         height = self.method.height
         if height == 0:

{ok-script-0.0.69 → ok-script-0.0.70}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.69 → ok-script-0.0.70}/setup.py

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