ok-script 0.0.151__tar.gz → 0.0.153__tar.gz

{ok-script-0.0.151/ok_script.egg-info → ok-script-0.0.153}/PKG-INFO

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

{ok-script-0.0.151 → ok-script-0.0.153}/ok/capture/HwndWindow.py

@@ -17,7 +17,7 @@ logger = get_logger(__name__)
 
 class HwndWindow:
 
-    def __init__(self, exit_event, title, exe_name=None, frame_width=0, frame_height=0, player_id=-1):
+    def __init__(self, exit_event, title, exe_name=None, frame_width=0, frame_height=0, player_id=-1, hwnd_class=None):
         super().__init__()
         self.app_exit_event = exit_event
         self.exe_name = exe_name
@@ -44,10 +44,12 @@ class HwndWindow:
         self.real_y_offset = 0
         self.scaling = 1.0
         self.frame_aspect_ratio = 0
+        self.hwnd_class = hwnd_class
+        self.pos_valid = False
+        self._hwnd_title = ""
         self.update_window(title, exe_name, frame_width, frame_height)
         self.thread = threading.Thread(target=self.update_window_size, name="update_window_size")
         self.thread.start()
-        self._hwnd_title = ""
 
     def stop(self):
         self.stop_event.set()
@@ -84,7 +86,7 @@ class HwndWindow:
                 name, self.hwnd, self.exe_full_path, self.real_x_offset, self.real_y_offset, self.real_width, self.real_height = find_hwnd(
                     self.title,
                     self.exe_name,
-                    self.frame_width, self.frame_height, player_id=self.player_id)
+                    self.frame_width, self.frame_height, player_id=self.player_id, class_name=self.hwnd_class)
                 if self.hwnd is not None:
                     logger.info(
                         f'found hwnd {self.hwnd} {self.exe_full_path} {win32gui.GetClassName(self.hwnd)} real:{self.real_x_offset},{self.real_y_offset},{self.real_width},{self.real_height}')
@@ -100,6 +102,14 @@ class HwndWindow:
                         if window_ratio < self.frame_aspect_ratio:
                             cropped_window_height = int(width / self.frame_aspect_ratio)
                             height = cropped_window_height
+                    pos_valid = check_pos(x, y, width, height)
+                    if not pos_valid and pos_valid != self.pos_valid and ok.gui.executor is not None:
+                        ok.gui.executor.pause()
+                        logger.error(f'ok.gui.executor.pause pos_invalid: {x, y, width, height}')
+                        communicate.notification.emit('Paused because game window is minimized or out of screen!', None,
+                                                      True, True)
+                    if pos_valid != self.pos_valid:
+                        self.pos_valid = pos_valid
                 else:
                     ok.gui.executor.pause()
                     communicate.notification.emit('Paused because game exited', None, True, True)
@@ -140,14 +150,18 @@ class HwndWindow:
         return f"title_{self.title}_{self.exe_name}_{self.width}x{self.height}_{self.hwnd}_{self.exists}_{self.visible}"
 
 
-def find_hwnd(title, exe_name, frame_width, frame_height, player_id=-1):
+def check_pos(x, y, width, height):
+    return x >= 0 and y >= 0 and width >= 0 and height >= 0
+
+
+def find_hwnd(title, exe_name, frame_width, frame_height, player_id=-1, class_name=None):
     results = []
     if exe_name is None and title is None:
         return None, None, None, 0, 0, 0, 0
     frame_aspect_ratio = frame_width / frame_height if frame_height != 0 else 0
 
     def callback(hwnd, lParam):
-        if win32gui.IsWindowVisible(hwnd) and win32gui.IsWindowEnabled(hwnd):
+        if win32gui.IsWindow(hwnd) and win32gui.IsWindowEnabled(hwnd) and win32gui.IsWindowVisible(hwnd):
             text = win32gui.GetWindowText(hwnd)
             if title:
                 if isinstance(title, str):
@@ -169,11 +183,15 @@ def find_hwnd(title, exe_name, frame_width, frame_height, player_id=-1):
                     logger.debug(
                         f'player id check failed,cmdline {cmdline} {get_player_id_from_cmdline(cmdline)} != {player_id}')
                     return True
+            if class_name is not None:
+                if win32gui.GetClassName(hwnd) != class_name:
+                    return True
             results.append(ret)
         return True
 
     win32gui.EnumWindows(callback, None)
     if len(results) > 0:
+        logger.info(f'find_hwnd {results}')
         biggest = None
         for result in results:
             if biggest is None or (result[2] * result[3]) > biggest[2] * biggest[3]:
@@ -252,12 +270,3 @@ def get_exe_by_hwnd(hwnd):
     except Exception as e:
         logger.error('get_exe_by_hwnd error', e)
         return None, None, 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)
-    # from ok.capture.windows.BitBltCaptureMethod import BitBltCaptureMethod
-    #
-    # method = BitBltCaptureMethod(hwnd_window)
-    # method.get_frame()

{ok-script-0.0.151 → ok-script-0.0.153}/ok/capture/adb/DeviceManager.py

@@ -35,7 +35,8 @@ class DeviceManager:
         self.resolution_dict = {}
         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'))
+                                   self.windows_capture_config.get('exe'),
+                                   hwnd_class=self.windows_capture_config.get('hwnd_class'))
             from ok.interaction.PostMessageInteraction import PostMessageInteraction
             from ok.interaction.PyDirectInteraction import PyDirectInteraction
             self.win_interaction_class = PostMessageInteraction if self.windows_capture_config.get(
@@ -117,7 +118,9 @@ class DeviceManager:
     def update_pc_device(self):
         if self.windows_capture_config is not None:
             name, hwnd, full_path, x, y, width, height = find_hwnd(self.windows_capture_config.get('title'),
-                                                                   self.windows_capture_config.get('exe'), 0, 0)
+                                                                   self.windows_capture_config.get('exe'), 0, 0,
+                                                                   class_name=self.windows_capture_config.get(
+                                                                       'hwnd_class'))
             nick = name or self.windows_capture_config.get('exe')
             pc_device = {"address": "", "imei": 'pc', "device": "windows",
                          "model": "", "nick": nick, "width": width,
@@ -289,7 +292,8 @@ class DeviceManager:
 
     def ensure_hwnd(self, title, exe, frame_width=0, frame_height=0, player_id=-1):
         if self.hwnd is None:
-            self.hwnd = HwndWindow(self.exit_event, title, exe, frame_width, frame_height, player_id)
+            self.hwnd = HwndWindow(self.exit_event, title, exe, frame_width, frame_height, player_id,
+                                   self.windows_capture_config.get('hwnd_class'))
         else:
             self.hwnd.update_window(title, exe, frame_width, frame_height, player_id)
 

{ok-script-0.0.151 → ok-script-0.0.153}/ok/capture/adb/WindowsCaptureFactory.py

@@ -40,7 +40,8 @@ def get_win_graphics_capture(capture_method, hwnd):
         from ok.capture.windows.WindowsGraphicsCaptureMethod import WindowsGraphicsCaptureMethod
         target_method = WindowsGraphicsCaptureMethod
         capture_method = get_capture(capture_method, target_method, hwnd)
-        return capture_method
+        if capture_method.start_or_stop():
+            return capture_method
 
 
 def get_capture(capture_method, target_method, hwnd):

{ok-script-0.0.151 → ok-script-0.0.153}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -159,11 +159,13 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
                 if WINDOWS_BUILD_NUMBER >= WGC_NO_BORDER_MIN_BUILD:
                     self.session.IsBorderRequired = False
                 self.session.StartCapture()
+                return True
             except Exception as e:
                 logger.error(f'start_or_stop failed: {self.hwnd_window}', exception=e)
+                return False
         elif not self.hwnd_window.exists and self.frame_pool is not None:
             self.close()
-
+            return False
         return self.hwnd_window.exists
 
     def create_device(self):

{ok-script-0.0.151 → ok-script-0.0.153}/ok/firebase/Analytics.py

@@ -105,7 +105,7 @@ class Analytics:
 
         logger.info(f'send report {params}')
 
-        response = requests.post(self.report_url, json=params)
+        response = requests.post(self.report_url, json=params, timeout=10)
 
         if response.status_code == 200:
             logger.debug(f'Successfully send report')

{ok-script-0.0.151 → ok-script-0.0.153}/ok/gui/StartController.py

@@ -76,16 +76,17 @@ class StartController(QObject):
         if not ok.gui.device_manager.capture_method.connected():
             logger.error(f'Game window is not connected {ok.gui.device_manager.capture_method}')
             return self.tr("Game window is not connected, please select the game window and capture method.")
-        if isinstance(ok.gui.device_manager.capture_method, BaseWindowsCaptureMethod) and self.config.get('windows',
-                                                                                                          {}).get(
-            'check_hdr_and_night_light', False):
-            logger.info(f'start checking for hdr and night light')
-            from ok.display.display import is_night_light_enabled
-            if is_night_light_enabled():
-                return self.tr(f'Windows night light is enabled, please turn it off first.')
-            from ok.display.display import is_hdr_enabled
-            if is_hdr_enabled():
-                return self.tr(f'Windows HDR is enabled, please turn it off first.')
+        if isinstance(ok.gui.device_manager.capture_method, BaseWindowsCaptureMethod):
+            if self.config.get('windows', {}).get('check_hdr_and_night_light', False):
+                logger.info(f'start checking for hdr and night light')
+                from ok.display.display import is_night_light_enabled
+                if is_night_light_enabled():
+                    return self.tr(f'Windows night light is enabled, please turn it off first.')
+                from ok.display.display import is_hdr_enabled
+                if is_hdr_enabled():
+                    return self.tr(f'Windows HDR is enabled, please turn it off first.')
+            if not ok.gui.device_manager.capture_method.hwnd_window.pos_valid:
+                return self.tr(f'Game window is minimized or out of screen, please restore it first!')
         frame = self.try_capture_a_frame()
         if frame is None:
             return self.tr('Capture failed, please check game window')

{ok-script-0.0.151 → ok-script-0.0.153/ok_script.egg-info}/PKG-INFO

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

{ok-script-0.0.151 → ok-script-0.0.153}/setup.py

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