ok-script 0.0.80__tar.gz → 0.0.82__tar.gz

{ok-script-0.0.80 → ok-script-0.0.82}/PKG-INFO

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

{ok-script-0.0.80 → ok-script-0.0.82}/ok/capture/adb/DeviceManager.py

@@ -19,8 +19,9 @@ class DeviceManager:
     def __init__(self, app_config, exit_event=None):
         self._device = None
         self._adb = None
-        self.supported_ratio = parse_ratio(app_config.get(
-            'supported_screen_ratio'))
+        supported_resolution = app_config.get(
+            'supported_resolution', {})
+        self.supported_ratio = parse_ratio(supported_resolution.get('ratio'))
         self.windows_capture_config = app_config.get('windows')
         self.adb_capture_config = app_config.get('adb')
         self.debug = app_config.get('debug')
@@ -142,10 +143,10 @@ class DeviceManager:
             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,
                                "nick": name or emulator.name, "emulator": emulator}
             if adb_device is not None:
                 emulator_device["resolution"] = f"{width}x{height}"
-                emulator_device["imei"] = emulator.name
                 emulator_device["adb_imei"] = self.adb_get_imei(adb_device)
             self.device_dict[emulator.name] = emulator_device
         logger.debug(f'refresh emulators {self.device_dict}')

{ok-script-0.0.80 → ok-script-0.0.82}/ok/gui/StartController.py

@@ -73,13 +73,21 @@ 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.")
-        supported_ratio = self.config.get(
-            'supported_screen_ratio')
-        supported, resolution = ok.gui.executor.check_frame_and_resolution(supported_ratio)
+        supported_resolution = self.config.get(
+            'supported_resolution', {})
+        supported_ratio = supported_resolution.get('ratio')
+        min_size = supported_resolution.get('min_size')
+        supported, resolution = ok.gui.executor.check_frame_and_resolution(supported_ratio, min_size)
         if not supported:
-            return self.tr(
-                "Window resolution {resolution} is not supported, the supported ratio is {supported_ratio}, check if game windows is minimized, resized or out of screen.",
-            ).format(resolution=resolution, supported_ratio=supported_ratio)
+            error = self.tr(
+                "Game resolution {resolution} is not supported").format(resolution=resolution)
+            if supported_ratio:
+                error += self.tr(', the supported ratio is {supported_ratio}').format(supported_ratio=supported_ratio)
+            if supported_ratio:
+                error += self.tr(', the supported min resolution is {min_size}').format(
+                    min_size=f'{min_size[0]}x{min_size[1]}')
+            error += self.tr(', check if game windows is minimized, resized or out of screen.')
+            return error
         if device and device['device'] == "windows" and not is_admin():
             return self.tr(
                 f"PC version requires admin privileges, Please restart this app with admin privileges!")