ok-script 0.0.41__tar.gz → 0.0.43__tar.gz

{ok-script-0.0.41 → ok-script-0.0.43}/PKG-INFO

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

{ok-script-0.0.41 → ok-script-0.0.43}/ok/capture/BaseCaptureMethod.py

@@ -8,13 +8,6 @@ class CaptureException(Exception):
 class BaseCaptureMethod:
     name = "None"
     description = ""
-    last_captured_frame: np.ndarray
-    top_cut = 0
-    bottom_cut = 0
-    left_cut = 0
-    right_cut = 0
-    width = 0
-    height = 0
     _size = (0, 0)
 
     def __init__(self):

{ok-script-0.0.41 → ok-script-0.0.43}/ok/capture/HwndWindow.py

@@ -101,7 +101,7 @@ class HwndWindow:
                     visible = is_foreground_window(self.hwnd)
                     x, y, border, title_height, width, height, scaling = get_window_bounds(
                         self.hwnd)
-                    if self.frame_aspect_ratio != 0:
+                    if self.frame_aspect_ratio != 0 and height != 0:
                         window_ratio = width / height
                         if window_ratio < self.frame_aspect_ratio:
                             cropped_window_height = int(width / self.frame_aspect_ratio)
@@ -124,7 +124,7 @@ class HwndWindow:
                     changed = True
                 if changed:
                     logger.debug(
-                        f"do_update_window_size changed: {self.visible} {self.x} {self.y} {self.border} {self.width} {self.height} {self.scaling}")
+                        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}")
                     communicate.window.emit(self.visible, self.x, self.y, self.border, self.title_height, self.width,
                                             self.height, self.scaling)
         except Exception as e:
@@ -141,38 +141,35 @@ class HwndWindow:
             return win32gui.GetWindowText(self.hwnd)
         return ""
 
+    def __str__(self) -> str:
+        return f"title:{self.title},exe:{self.exe_name},width:{self.width},height:{self.height},exists:{self.exists},visible:{self.visible}"
 
-def find_hwnd_by_title_and_exe(title, exe):
-    if not title and not exe:
+
+def find_hwnd_by_title_and_exe(title, exe_name):
+    result = []
+    if title is None and exe_name is None:
         return None
-    hwnds = find_hwnds_by_title(title)
-    if exe is not None:
-        for hwnd in hwnds:
-            exe_2 = get_exe_name_by_hwnd(hwnd)
-            if exe_2 == exe:
-                return hwnd
-    if len(hwnds) > 0:
-        return hwnds[0]
-
-
-def find_hwnds_by_title(title):
-    hwnds = []
-    if not title:
-        return hwnds
-
-    def enum_windows_proc(hwnd, lParam):
-        text = win32gui.GetWindowText(hwnd)
-        if text and win32gui.IsWindowVisible(hwnd):
-            if isinstance(title, str) and title == text:
-                hwnds.append(hwnd)
-            elif re.search(title, text):
-                hwnds.append(hwnd)
-
-    win32gui.EnumWindows(enum_windows_proc, None)
-    if len(hwnds) > 0:
-        if len(hwnds) > 1:
-            logger.warning(f"Found multiple hwnds {len(hwnds)}")
-    return hwnds
+
+    def callback(hwnd, lParam):
+        if len(result) == 0 and win32gui.IsWindowVisible(hwnd) and win32gui.IsWindowEnabled(hwnd):
+            if title:
+                text = win32gui.GetWindowText(hwnd)
+                if isinstance(title, str):
+                    if title != text:
+                        return True
+                elif not re.search(title, text):
+                    return True
+            if exe_name:
+                name = get_exe_name_by_hwnd(hwnd)
+                if name == exe_name:
+                    result.append(hwnd)
+                    return True  # Stop enumeration as we found the first match
+            else:
+                result.append(hwnd)
+        return True
+
+    win32gui.EnumWindows(callback, None)
+    return result[0] if result else None
 
 
 OpenProcess = ctypes.windll.kernel32.OpenProcess

{ok-script-0.0.41 → ok-script-0.0.43}/ok/capture/adb/DeviceManager.py

@@ -26,6 +26,7 @@ class DeviceManager:
         self.adb = self.adb = adbutils.AdbClient(host="127.0.0.1")
         logger.debug(f'connect adb')
         self.hwnd_title = hwnd_title
+        self.pc_device = None
         self.exe_name = exe_name
         self.debug = debug
         self.interaction = None
@@ -44,7 +45,15 @@ class DeviceManager:
 
     @property
     def device_dict(self):
-        return self.config.get("devices")
+        device_dict = self.config.get("devices")
+        if device_dict is None:
+            device_dict = {}
+        if self.pc_device is not None:
+            full = {'pc': self.pc_device}
+            full.update(device_dict)
+            return full
+        else:
+            return device_dict
 
     def connect_all(self):
         if not self._connect_all:
@@ -61,7 +70,6 @@ class DeviceManager:
         return list(self.device_dict.values())
 
     def do_refresh(self):
-        self.connect_all()
 
         if self.hwnd_title:
             nick = ""
@@ -74,16 +82,18 @@ class DeviceManager:
                     hwnd)
             if not nick:
                 nick = self.exe_name
-            self.device_dict[self.hwnd_title] = {"address": "", "imei": self.hwnd_title, "device": "windows",
-                                                 "model": "", "nick": nick, "width": width,
-                                                 "height": height,
-                                                 "hwnd": nick, "capture": "windows",
-                                                 "connected": hwnd is not None
-                                                 }
+            self.pc_device = {"address": "", "imei": 'pc', "device": "windows",
+                              "model": "", "nick": nick, "width": width,
+                              "height": height,
+                              "hwnd": nick, "capture": "windows",
+                              "connected": hwnd is not None
+                              }
             if width != 0:
-                self.device_dict[self.hwnd_title]["resolution"] = f"{width}x{height}"
+                self.pc_device["resolution"] = f"{width}x{height}"
             communicate.adb_devices.emit(False)
 
+        self.connect_all()
+
         installed_emulators = installed_emulator()
         for device in self.adb.list():
             logger.debug(f'adb.list() {device}')
@@ -120,15 +130,15 @@ class DeviceManager:
                     old_hwnd = self.device_dict[imei].get("hwnd")
                     self.device_dict[imei] = adb_device
                     if old_capture is not None:
-                        self.device_dict[imei]['capture'] = old_capture
+                        self.update_device_value(imei, 'capture', old_capture)
                     if old_hwnd is not None:
-                        self.device_dict[imei]['hwnd'] = old_hwnd
+                        self.update_device_value(imei, 'hwnd', old_hwnd)
             else:
-                self.device_dict[imei] = adb_device
+                self.update_device(imei, adb_device)
             adb_connected.append(imei)
         for imei in self.device_dict:
             if imei not in adb_connected and self.device_dict[imei]['device'] == 'adb':
-                self.device_dict[imei]['connected'] = False
+                self.update_device_value(imei, 'connected', False)
 
         self.config.save_file()
 
@@ -138,6 +148,17 @@ class DeviceManager:
         communicate.adb_devices.emit(True)
         logger.debug(f'refresh {self.device_dict}')
 
+    def update_device(self, imei, device=None):
+        devices = self.config.get("devices", {})
+        devices[imei] = device
+        self.config["devices"] = devices
+
+    def update_device_value(self, imei, key, value):
+        devices = self.config.get("devices", {})
+        if imei in devices:
+            devices[imei][key] = value
+        self.config["devices"] = devices
+
     def set_preferred_device(self, imei=None):
         logger.debug(f"set_preferred_device {imei}")
         if imei is None:

{ok-script-0.0.41 → ok-script-0.0.43}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -118,37 +118,42 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
         self.start_or_stop()
 
     def connected(self):
-        return self.hwnd_window is not None and self.hwnd_window.exists
+        return self.hwnd_window is not None and self.hwnd_window.exists and self.frame_pool is not None
 
     def start_or_stop(self, capture_cursor=False):
+
         if self.hwnd_window.exists and self.frame_pool is None:
-            logger.info('init windows capture')
-            self.rtdevice = IDirect3DDevice()
-            self.dxdevice = d3d11.ID3D11Device()
-            self.immediatedc = d3d11.ID3D11DeviceContext()
-            self.create_device()
-            interop = GetActivationFactory('Windows.Graphics.Capture.GraphicsCaptureItem').astype(
-                IGraphicsCaptureItemInterop)
-            item = interop.CreateForWindow(self.hwnd_window.hwnd, IGraphicsCaptureItem.GUID)
-            self.item = item
-            self.last_size = item.Size
-            delegate = TypedEventHandler(GraphicsCaptureItem, IInspectable).delegate(
-                self.close)
-            self.evtoken = item.add_Closed(delegate)
-            self.frame_pool = Direct3D11CaptureFramePool.CreateFreeThreaded(self.rtdevice,
-                                                                            DirectXPixelFormat.B8G8R8A8UIntNormalized,
-                                                                            1, item.Size)
-            self.session = self.frame_pool.CreateCaptureSession(item)
-            pool = self.frame_pool
-            pool.add_FrameArrived(
-                TypedEventHandler(Direct3D11CaptureFramePool, IInspectable).delegate(
-                    self.frame_arrived_callback))
-            self.session.IsCursorCaptureEnabled = capture_cursor
-            if WINDOWS_BUILD_NUMBER >= WGC_NO_BORDER_MIN_BUILD:
-                self.session.IsBorderRequired = False
-            self.session.StartCapture()
+            try:
+                logger.info('init windows capture')
+                self.rtdevice = IDirect3DDevice()
+                self.dxdevice = d3d11.ID3D11Device()
+                self.immediatedc = d3d11.ID3D11DeviceContext()
+                self.create_device()
+                interop = GetActivationFactory('Windows.Graphics.Capture.GraphicsCaptureItem').astype(
+                    IGraphicsCaptureItemInterop)
+                item = interop.CreateForWindow(self.hwnd_window.hwnd, IGraphicsCaptureItem.GUID)
+                self.item = item
+                self.last_size = item.Size
+                delegate = TypedEventHandler(GraphicsCaptureItem, IInspectable).delegate(
+                    self.close)
+                self.evtoken = item.add_Closed(delegate)
+                self.frame_pool = Direct3D11CaptureFramePool.CreateFreeThreaded(self.rtdevice,
+                                                                                DirectXPixelFormat.B8G8R8A8UIntNormalized,
+                                                                                1, item.Size)
+                self.session = self.frame_pool.CreateCaptureSession(item)
+                pool = self.frame_pool
+                pool.add_FrameArrived(
+                    TypedEventHandler(Direct3D11CaptureFramePool, IInspectable).delegate(
+                        self.frame_arrived_callback))
+                self.session.IsCursorCaptureEnabled = capture_cursor
+                if WINDOWS_BUILD_NUMBER >= WGC_NO_BORDER_MIN_BUILD:
+                    self.session.IsBorderRequired = False
+                self.session.StartCapture()
+            except Exception as e:
+                logger.error(f'start_or_stop failed: {self.hwnd_window}', exception=e)
         elif not self.hwnd_window.exists and self.frame_pool is not None:
             self.close()
+
         return self.hwnd_window.exists
 
     def create_device(self):

{ok-script-0.0.41 → ok-script-0.0.43}/ok/task/ExecutorOperation.py

@@ -13,10 +13,13 @@ class ExecutorOperation:
     def box_in_horizontal_center(self, box, off_percent=0.02):
         if box is None:
             return False
+
         center = self.executor.method.width / 2
-        left = center - box.x
-        right = box.x + box.width - center
-        if left > 0 and right > 0 and abs(left - right) / box.width < off_percent:
+        box_center = box.x + box.width / 2
+
+        offset = abs(box_center - center)
+
+        if offset / self.executor.method.width < off_percent:
             return True
         else:
             return False

{ok-script-0.0.41 → ok-script-0.0.43}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.41 → ok-script-0.0.43}/setup.py

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