ok-script 0.0.83__tar.gz → 0.0.85__tar.gz

{ok-script-0.0.83 → ok-script-0.0.85}/PKG-INFO

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

{ok-script-0.0.83 → ok-script-0.0.85}/ok/alas/emulator_base.py

@@ -114,6 +114,14 @@ class EmulatorInstanceBase:
 
         return None
 
+    @property
+    def player_id(self):
+
+        # Find all integer groups in the string that are at the end of the string
+        integers = re.findall(r'\d+$', self.name)
+        # Return the last integer if it exists, otherwise return 0
+        return int(integers[0]) if integers else 0
+
 
 class EmulatorBase:
     # Values here must match those in argument.yaml EmulatorInfo.Emulator.option

{ok-script-0.0.83 → ok-script-0.0.85}/ok/capture/HwndWindow.py

@@ -42,31 +42,23 @@ class HwndWindow:
     real_x_offset = 0
     real_y_offset = 0
 
-    def __init__(self, exit_event, title, exe_name=None, frame_width=0, frame_height=0):
+    def __init__(self, exit_event, title, exe_name=None, frame_width=0, frame_height=0, player_id=-1):
         super().__init__()
         self.app_exit_event = exit_event
         self.exe_name = exe_name
         self.title = title
         self.stop_event = threading.Event()
         self.visible = False
+        self.player_id = player_id
         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()
 
-    def update_title_and_exe(self, title, exe):
-        self.title = title
-        self.exe_name = exe
-        self.hwnd = None
-        self.visible = False
-        self.exists = False
-        self.width = 0
-        self.height = 0
-        self.do_update_window_size()
-
     def stop(self):
         self.stop_event.set()
 
-    def update_window(self, title, exe_name, frame_width, frame_height):
+    def update_window(self, title, exe_name, frame_width, frame_height, player_id=-1):
+        self.player_id = player_id
         self.title = title
         self.exe_name = exe_name
         self.update_frame_size(frame_width, frame_height)
@@ -100,7 +92,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)
+                    self.frame_width, self.frame_height, player_id=self.player_id)
                 self.exists = self.hwnd is not None
             if self.hwnd is not None:
                 self.exists = win32gui.IsWindow(self.hwnd)
@@ -152,7 +144,7 @@ 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):
+def find_hwnd(title, exe_name, frame_width, frame_height, player_id=-1):
     results = []
     if exe_name is None and title is None:
         return None, None, None, 0, 0, 0, 0
@@ -167,18 +159,22 @@ def find_hwnd(title, exe_name, frame_width, frame_height):
                         return True
                 elif not re.search(title, text):
                     return True
-            name, full_path = get_exe_by_hwnd(hwnd)
+            name, full_path, cmdline = get_exe_by_hwnd(hwnd)
             x, y, border, title_height, width, height, scaling, ext_left_bounds, ext_top_bounds = get_window_bounds(
                 hwnd)
             ret = (hwnd, full_path, width, height, x, y, text)
             if exe_name:
                 if name != exe_name and exe_name != full_path:
                     return True
+            if player_id != -1:
+                if player_id != get_player_id_from_cmdline(cmdline):
+                    logger.debug(
+                        f'player id check failed,cmdline {cmdline} {get_player_id_from_cmdline(cmdline)} != {player_id}')
+                    return True
             results.append(ret)
         return True
 
     win32gui.EnumWindows(callback, None)
-    biggest = None
     if len(results) > 0:
         biggest = results[0]
         for result in results:
@@ -201,6 +197,20 @@ def find_hwnd(title, exe_name, frame_width, frame_height):
     return None, None, None, 0, 0, 0, 0
 
 
+def get_player_id_from_cmdline(cmdline):
+    for i in range(len(cmdline)):
+        if i != 0:
+            if cmdline[i].isdigit():
+                return int(cmdline[i])
+    for i in range(len(cmdline)):
+        if i != 0:
+            value = re.search(r'index=(\d+)', cmdline[i])
+            # Return the value if it exists, otherwise return None
+            if value is not None:
+                return int(value.group(1))
+    return 0
+
+
 def enum_child_windows(biggest, frame_aspect_ratio):
     ratio_match = []
     """
@@ -237,7 +247,7 @@ def get_exe_by_hwnd(hwnd):
 
     # Get the process name and executable path
     process = psutil.Process(pid)
-    return process.name(), process.exe()
+    return process.name(), process.exe(), process.cmdline()
 
 
 if __name__ == '__main__':

{ok-script-0.0.83 → ok-script-0.0.85}/ok/capture/adb/DeviceManager.py

@@ -101,9 +101,7 @@ class DeviceManager:
 
     def do_refresh(self, current=False):
         self.update_pc_device()
-
         self.refresh_emulators(current)
-
         self.refresh_phones(current)
 
         if self.exit_event.is_set():
@@ -131,7 +129,7 @@ class DeviceManager:
                     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,
+                                    "nick": adb_device.prop.model or imei, "player_id": -1,
                                     "resolution": f'{width}x{height}'}
                     self.device_dict[imei] = phone_device
 
@@ -149,11 +147,11 @@ class DeviceManager:
             adb_device = self.adb_connect(emulator.serial)
             width, height = self.get_resolution(adb_device)
             name, hwnd, full_path, x, y, width, height = find_hwnd(None,
-                                                                   emulator.path, width, height)
+                                                                   emulator.path, width, height, emulator.player_id)
             connected = adb_device is not None and name is not None
             emulator_device = {"address": emulator.serial, "device": "adb",
                                "full_path": emulator.path, "connected": connected,
-                               "imei": emulator.name,
+                               "imei": emulator.name, "player_id": emulator.player_id,
                                "nick": name or emulator.name, "emulator": emulator}
             if adb_device is not None:
                 emulator_device["resolution"] = f"{width}x{height}"
@@ -236,11 +234,11 @@ class DeviceManager:
         preferred = self.get_preferred_device()
         return preferred.get('hwnd')
 
-    def ensure_hwnd(self, title, exe, frame_width=0, frame_height=0):
+    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)
+            self.hwnd = HwndWindow(self.exit_event, title, exe, frame_width, frame_height, player_id)
         else:
-            self.hwnd.update_window(title, exe, frame_width, frame_height)
+            self.hwnd.update_window(title, exe, frame_width, frame_height, player_id)
 
     def use_windows_capture(self, override_config=None, require_bg=False, use_bit_blt_only=False):
         if not override_config:
@@ -271,7 +269,7 @@ class DeviceManager:
         else:
             width, height = self.get_resolution()
             if self.config.get('capture') == "windows":
-                self.ensure_hwnd(None, preferred.get('full_path'), width, height)
+                self.ensure_hwnd(None, preferred.get('full_path'), width, height, preferred['player_id'])
                 self.use_windows_capture({'can_bit_blt': True}, require_bg=True, use_bit_blt_only=True)
             else:
                 if not isinstance(self.capture_method, ADBCaptureMethod):
@@ -281,7 +279,7 @@ class DeviceManager:
                     self.capture_method = ADBCaptureMethod(self, self.exit_event, width=width,
                                                            height=height)
                 if self.debug and preferred.get('full_path'):
-                    self.ensure_hwnd(None, preferred.get('full_path'), width, height)
+                    self.ensure_hwnd(None, preferred.get('full_path'), width, height, preferred['player_id'])
                 elif self.hwnd is not None:
                     self.hwnd.stop()
                     self.hwnd = None

{ok-script-0.0.83 → ok-script-0.0.85}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.83 → ok-script-0.0.85}/setup.py

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