ok-script 1.0.149__tar.gz → 1.0.151__tar.gz

{ok_script-1.0.149 → ok_script-1.0.151}/PKG-INFO

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

{ok_script-1.0.149 → ok_script-1.0.151}/ok/device/capture_methods/browser.py

@@ -282,13 +282,24 @@ class BrowserWindowAdapter:
     def height(self):
         return self.capture.height
 
-    @property
-    def exe_full_path(self):
-        return self.capture.exe_full_path
-
-    def get_abs_cords(self, x, y):
-        try:
-            rect = win32gui.GetWindowRect(self.capture.hwnd)
+    @property
+    def exe_full_path(self):
+        return self.capture.exe_full_path
+
+    @property
+    def capture_target_signature(self):
+        return (
+            self.hwnd,
+            self.width,
+            self.height,
+            self.capture.x_offset,
+            self.capture.y_offset,
+            self.capture.exe_full_path,
+        )
+
+    def get_abs_cords(self, x, y):
+        try:
+            rect = win32gui.GetWindowRect(self.capture.hwnd)
             return rect[0] + self.capture.x_offset + x, rect[1] + self.capture.y_offset + y
         except:
             return x, y

{ok_script-1.0.149 → ok_script-1.0.151}/ok/device/capture_methods/hwnd_window.py

@@ -190,12 +190,27 @@ class HwndWindow:
     def get_abs_cords(self, x, y):
         return self.x + x, self.y + y
 
-    def get_top_window_cords(self, x, y):
-        return x - self.top_offset_x, y - self.top_offset_y
-
-    def do_update_window_size(self):
-        if self.device_manager and getattr(self.device_manager, 'capture_method', None):
-            from ok.device.capture_methods.browser import BrowserCaptureMethod
+    def get_top_window_cords(self, x, y):
+        return x - self.top_offset_x, y - self.top_offset_y
+
+    @property
+    def capture_target_signature(self):
+        hwnds = tuple(hwnd_info[0] for hwnd_info in (self.hwnds or []))
+        return (
+            self.hwnd,
+            self.top_hwnd,
+            self.width,
+            self.height,
+            self.real_x_offset,
+            self.real_y_offset,
+            self.real_width,
+            self.real_height,
+            hwnds,
+        )
+
+    def do_update_window_size(self):
+        if self.device_manager and getattr(self.device_manager, 'capture_method', None):
+            from ok.device.capture_methods.browser import BrowserCaptureMethod
             if isinstance(self.device_manager.capture_method, BrowserCaptureMethod):
                 return
         try:

{ok_script-1.0.149 → ok_script-1.0.151}/ok/device/capture_methods/windows_graphics.py

@@ -3,18 +3,18 @@ import threading
 import time
 
 import numpy as np
-import win32gui
-
-from ok.util.logger import Logger
-from ok.util.window import WINDOWS_BUILD_NUMBER, WGC_NO_BORDER_MIN_BUILD
+import win32gui
+
+from ok.util.logger import Logger
+from ok.util.window import WINDOWS_BUILD_NUMBER, WGC_NO_BORDER_MIN_BUILD
 
 from ok.device.capture_methods import bitblt
 from ok.device.capture_methods.base import BaseWindowsCaptureMethod
 from ok.device.capture_methods.bitblt_utils import PBYTE, composite_hwnds, get_crop_point
 
-logger = Logger.get_logger(__name__)
-
-class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
+logger = Logger.get_logger(__name__)
+
+class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
     name = "Windows Graphics Capture"
     description = "fast, most compatible, capped at 60fps"
 
@@ -34,10 +34,11 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
         self.dxdevice = None
         self.immediatedc = None
         self.last_frame = None
-        self.last_size = None
-        self.last_start_failure_key = None
-        self.last_start_failure_time = 0
-        self.start_or_stop()
+        self.last_size = None
+        self.last_start_failure_key = None
+        self.last_start_failure_time = 0
+        self.capture_target_signature = None
+        self.start_or_stop()
 
     def frame_arrived_callback(self, *args):
         next_frame = None
@@ -133,12 +134,12 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
         try:
             if hwnd and win32gui.IsWindow(hwnd):
                 return hwnd
-        except Exception:
-            pass
-        return 0
-
-    def start_or_stop(self, capture_cursor=False):
-        with self.lock:
+        except Exception:
+            pass
+        return 0
+
+    def start_or_stop(self, capture_cursor=False):
+        with self.lock:
             if self.exit_event.is_set():
                 logger.warning('start_or_stop exit_event.is_set() return')
                 self.close()
@@ -149,16 +150,18 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
                 return False
 
             capture_hwnd = self.get_capture_hwnd()
-            if not capture_hwnd:
-                logger.warning(f'start_or_stop no valid hwnd: {self.hwnd_window}')
-                self.close()
-                return False
-
-            if self.frame_pool is not None and self.capture_hwnd != capture_hwnd:
-                logger.info(f'start_or_stop hwnd changed from {self.capture_hwnd} to {capture_hwnd}')
-                self.close()
-
-            failure_key = capture_hwnd
+            if not capture_hwnd:
+                logger.warning(f'start_or_stop no valid hwnd: {self.hwnd_window}')
+                self.close()
+                return False
+
+            target_signature = self.hwnd_window.capture_target_signature
+            if self.frame_pool is not None and self.capture_target_signature != target_signature:
+                logger.info(
+                    f'start_or_stop WGC target changed from {self.capture_target_signature} to {target_signature}')
+                self.close()
+
+            failure_key = capture_hwnd
             if self.frame_pool is None and self.last_start_failure_key == failure_key and time.time() - self.last_start_failure_time < 5:
                 return False
 
@@ -204,9 +207,10 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
                     self.session.IsCursorCaptureEnabled = capture_cursor
                     if WINDOWS_BUILD_NUMBER >= WGC_NO_BORDER_MIN_BUILD:
                         self.session.IsBorderRequired = False
-                    self.session.StartCapture()
-                    self.last_start_failure_key = None
-                    return True
+                    self.session.StartCapture()
+                    self.last_start_failure_key = None
+                    self.capture_target_signature = target_signature
+                    return True
                 except Exception as e:
                     self.last_start_failure_key = failure_key
                     self.last_start_failure_time = time.time()
@@ -251,10 +255,11 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
             if self.immediatedc:
                 self.immediatedc.Release()
                 self.immediatedc = None
-            if self.cputex:
-                self.cputex.Release()
-                self.cputex = None
-            self.capture_hwnd = 0
+            if self.cputex:
+                self.cputex.Release()
+                self.cputex = None
+            self.capture_hwnd = 0
+            self.capture_target_signature = None
 
     def do_get_frame(self):
 
@@ -298,16 +303,16 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
 
             frame = composite_hwnds(frame, self.hwnd_window, self.contexts, bitblt.render_full)
 
-            if frame is not None:
-                new_height = frame.shape[0]
-                new_width = frame.shape[1]
-                if new_width <= 0 or new_height <= 0:
-                    logger.warning(f"get_frame size <=0 {new_width}x{new_height}")
-                    return None
-
-            return frame
-
-    def reset_framepool(self, size, reset_device=False):
+            if frame is not None:
+                new_height = frame.shape[0]
+                new_width = frame.shape[1]
+                if new_width <= 0 or new_height <= 0:
+                    logger.warning(f"get_frame size <=0 {new_width}x{new_height}")
+                    return None
+
+            return frame
+
+    def reset_framepool(self, size, reset_device=False):
         logger.info(f'reset_framepool')
         from ok.rotypes.Windows.Graphics.DirectX import DirectXPixelFormat
         if self.cputex:

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/MainWindow.py

@@ -85,9 +85,10 @@ class MainWindow(FluentWindow):
 
         self.addSubInterface(self.start_tab, FluentIcon.PLAY, self.tr('Capture'))
 
-        self.first_task_tab = None
-        self.grouped_task_tabs = []
-        self.schedule_tab = None
+        self.first_task_tab = None
+        self.grouped_task_tabs = []
+        self.schedule_tab = None
+        self.global_config_tabs = []
 
         # Prepare custom tabs and separate them by add_after_default_tabs
         before_custom_tabs = []
@@ -176,13 +177,21 @@ class MainWindow(FluentWindow):
 
         # 添加计划任务Tab
         any_support_schedule = any(task.support_schedule_task for task in visible_onetime_tasks)
-        if any_support_schedule:
-            from ok.gui.tasks.ScheduleTaskTab import ScheduleTaskTab
-            self.schedule_tab = ScheduleTaskTab(config=self.config)
-            self.addSubInterface(self.schedule_tab, FluentIcon.CALENDAR, self.tr('Schedule'))
-        from ok.gui.about.AboutTab import AboutTab
-        self.about_tab = AboutTab(config)
-        self.addSubInterface(self.about_tab, FluentIcon.QUESTION, self.tr('About'),
+        if any_support_schedule:
+            from ok.gui.tasks.ScheduleTaskTab import ScheduleTaskTab
+            self.schedule_tab = ScheduleTaskTab(config=self.config)
+            self.addSubInterface(self.schedule_tab, FluentIcon.CALENDAR, self.tr('Schedule'))
+
+        for name, config_obj, option in global_config.get_all_visible_configs():
+            if getattr(option, 'show_at_tab', False):
+                from ok.gui.settings.GlobalConfigTab import GlobalConfigTab
+                config_tab = GlobalConfigTab(config_obj, option)
+                self.global_config_tabs.append(config_tab)
+                self.addSubInterface(config_tab, option.icon or FluentIcon.INFO, self.app.tr(option.name))
+
+        from ok.gui.about.AboutTab import AboutTab
+        self.about_tab = AboutTab(config)
+        self.addSubInterface(self.about_tab, FluentIcon.QUESTION, self.tr('About'),
                              position=NavigationItemPosition.BOTTOM)
 
         from ok.gui.settings.SettingTab import SettingTab
@@ -307,9 +316,13 @@ class MainWindow(FluentWindow):
             except Exception as e:
                 logger.debug(f'bring_to_front native activation failed: {e}')
 
-    def goto_global_config(self, key):
-        self.switchTo(self.setting_tab)
-        self.setting_tab.goto_config(key)
+    def goto_global_config(self, key):
+        for config_tab in self.global_config_tabs:
+            if config_tab.has_key(key):
+                self.switchTo(config_tab)
+                return
+        self.switchTo(self.setting_tab)
+        self.setting_tab.goto_config(key)
 
     def tray_quit(self):
         logger.info('main window tray_quit')

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/StartController.py

@@ -123,10 +123,10 @@ class StartController(QObject):
             time.sleep(2)
         return False
 
-    def _wait_until_started_window_stable(self):
-        wait_until = time.monotonic() + self.start_timeout
-        stable_size = None
-        stable_since = None
+    def _wait_until_started_window_stable(self):
+        wait_until = time.monotonic() + self.start_timeout
+        stable_size = None
+        stable_since = None
         min_width, min_height = self.STARTED_WINDOW_MIN_SIZE
 
         while not self.exit_event.is_set():
@@ -151,12 +151,12 @@ class StartController(QObject):
             if remaining_time <= 0:
                 communicate.starting_emulator.emit(True, self.tr('Start game timeout!'), 0)
                 return False
-            time.sleep(self.STARTED_WINDOW_POLL_INTERVAL)
-        return False
-
-    def start_device(self):
-        device = og.device_manager.get_preferred_device()
-        logger.info(f'start_device: {device}')
+            time.sleep(self.STARTED_WINDOW_POLL_INTERVAL)
+        return False
+
+    def start_device(self):
+        device = og.device_manager.get_preferred_device()
+        logger.info(f'start_device: {device}')
 
         if device and not device['connected']:
             if device['device'] == "windows" and not is_admin():
@@ -172,13 +172,13 @@ class StartController(QObject):
                 dx11_config = og.global_config.get_config('Launch with DX11')
                 if dx11_config and dx11_config.get('Launch with DX11'):
                     args = "-dx11 -d3d11 -force-d3d11"
-                if not execute(path, arguments=args):
-                    communicate.starting_emulator.emit(True, self.tr("Start game failed, please start game first"), 0)
-                    return False
-                if device['device'] == "windows" and not self._wait_until_started_window_stable():
-                    return False
-                if not self._wait_until_device_ready():
-                    return False
+                if not execute(path, arguments=args):
+                    communicate.starting_emulator.emit(True, self.tr("Start game failed, please start game first"), 0)
+                    return False
+                if device['device'] == "windows" and not self._wait_until_started_window_stable():
+                    return False
+                if not self._wait_until_device_ready():
+                    return False
             else:
                 communicate.starting_emulator.emit(True,
                                                    self.tr('Game path does not exist, Please open game manually!'), 0)

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/en_US.ts

@@ -2620,4 +2620,11 @@
             <translation>NPU inferring Error, you might need to update the Intel NPU driver!</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>Reset Config</translation>
+        </message>
+    </context>
 </TS>

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/es_ES.ts

@@ -2618,4 +2618,11 @@
             <translation>¡Error de inferencia de la NPU, es posible que necesite actualizar el controlador de la NPU de Intel!</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>Restablecer configuración</translation>
+        </message>
+    </context>
 </TS>

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/ja_JP.ts

@@ -2610,4 +2610,11 @@
             <translation>NPU推論エラー。Intel NPUドライバーを更新する必要があるかもしれません。</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>設定をリセット</translation>
+        </message>
+    </context>
 </TS>

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/ko_KR.ts

@@ -2619,4 +2619,11 @@
             <translation>NPU 추론 오류, Intel NPU 드라이버를 업데이트해야 할 수 있습니다!</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>설정 초기화</translation>
+        </message>
+    </context>
 </TS>

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/zh_CN.ts

@@ -2616,4 +2616,11 @@
             <translation>NPU推理错误，您可能需要更新Intel NPU驱动！</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>重置配置</translation>
+        </message>
+    </context>
 </TS>

{ok_script-1.0.149 → ok_script-1.0.151}/ok/gui/i18n/zh_TW.ts

@@ -2614,4 +2614,11 @@
             <translation>NPU推理錯誤，您可能需要更新Intel NPU驅動程式！</translation>
         </message>
     </context>
+    <context>
+        <name>GlobalConfigTab</name>
+        <message>
+            <source>Reset Config</source>
+            <translation>重設設定</translation>
+        </message>
+    </context>
 </TS>