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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.83
+Version: 0.0.84
 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.84}/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.84}/ok/capture/HwndWindow.py

@@ -152,7 +152,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 +167,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 +205,14 @@ 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])
+    return 0
+
+
 def enum_child_windows(biggest, frame_aspect_ratio):
     ratio_match = []
     """
@@ -237,7 +249,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.84}/ok/capture/adb/DeviceManager.py

@@ -149,7 +149,7 @@ 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,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.83
+Version: 0.0.84
 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.84}/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.84",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",