ok-script 1.0.140__tar.gz → 1.0.142__tar.gz

{ok_script-1.0.140 → ok_script-1.0.142}/PKG-INFO

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

{ok_script-1.0.140 → ok_script-1.0.142}/ok/__init__.py

@@ -23,7 +23,7 @@ from ok.gui.Communicate import communicate
 from ok.gui.MainWindow import MainWindow
 from ok.task.TaskExecutor import TaskExecutor
 from ok.util.Analytics import Analytics
-from ok.util.GlobalConfig import GlobalConfig, basic_options
+from ok.util.GlobalConfig import GlobalConfig, register_basic_options
 from ok.util.clazz import init_class_by_name
 from ok.util.config import Config, ConfigOption
 from ok.util.handler import Handler, ExitEvent
@@ -97,7 +97,7 @@ class App:
         logger.debug(f'locale name {self.locale.name()}')
 
         self.loading_window = None
-        self.overlay_window = None
+        self.overlay_window = None
         self.main_window = None
         self.exit_event = exit_event
         self.icon = QIcon(get_path_relative_to_exe(config.get('gui_icon')) or ":/icon/icon.ico")
@@ -109,11 +109,7 @@ class App:
         else:
             self.to_translate = None
             
-        if self.ok_config.get('use_overlay', False):
-            logger.debug('init overlay')
-            from ok.gui.overlay.OverlayWindow import OverlayWindow
-            self.overlay_window = OverlayWindow(og.device_manager.hwnd_window)
-        self.po_translation = None
+        self.po_translation = None
         if not config.get('window_size'):
             logger.info(f'no config.window_size was set use default')
             config['window_size'] = {
@@ -127,10 +123,12 @@ class App:
         if task_executor:
             og.device_manager = task_executor.device_manager
 
-        if my_app := self.config.get('my_app'):
-            og.my_app = init_class_by_name(my_app[0], my_app[1], exit_event)
-
-        if self.config.get('analytics'):
+        if my_app := self.config.get('my_app'):
+            og.my_app = init_class_by_name(my_app[0], my_app[1], exit_event)
+            if not hasattr(og.my_app, 'get_overlay_view'):
+                og.my_app.get_overlay_view = self.get_overlay_view
+
+        if self.config.get('analytics'):
             self.fire_base_analytics = Analytics(self.config, self.exit_event, og.handler, og.device_manager)
         logger.debug('init app end')
 
@@ -188,16 +186,25 @@ class App:
             path=path)
         self.show_message_window(title, content)
 
-    def update_overlay(self, visible, x, y, window_width, window_height, width, height, scaling):
-
-        self.overlay_window.update_overlay(visible, x, y, window_width, window_height, width, height, scaling)
+    def update_overlay(self, visible, x, y, window_width, window_height, width, height, scaling):
+        overlay_view = self.get_overlay_view()
+        if overlay_view:
+            overlay_view.update_overlay(visible, x, y, window_width, window_height, width, height, scaling)
+
+    def get_overlay_view(self):
+        """Return the overlay widget exposed to tasks, custom tabs, and my_app."""
+        if self.overlay_window is None:
+            from ok.gui.overlay.OverlayWindow import OverlayWindow
+            self.overlay_window = OverlayWindow(og.device_manager.hwnd_window)
+            communicate.window.connect(self.overlay_window.update_overlay)
+            self.overlay_window.set_boxes_enabled(self.ok_config.get('use_overlay', False))
+        return self.overlay_window
 
     def show_main_window(self):
         self.do_show_main()
 
-    def do_show_main(self):
-        if self.overlay_window:
-            communicate.window.connect(self.overlay_window.update_overlay)
+    def do_show_main(self):
+        self.get_overlay_view()
 
         self.main_window = MainWindow(self, self.config, self.ok_config, self.icon, self.title, self.version,
                                       self.debug,
@@ -263,6 +270,8 @@ class HeadlessApp:
         og.app = self
         if my_app := self.config.get('my_app'):
             og.my_app = init_class_by_name(my_app[0], my_app[1], exit_event)
+            if not hasattr(og.my_app, 'get_overlay_view'):
+                og.my_app.get_overlay_view = self.get_overlay_view
         logger.debug('init headless app end')
 
     def tr(self, key):
@@ -289,6 +298,9 @@ class HeadlessApp:
         if self.exit_event:
             self.exit_event.set()
 
+    def get_overlay_view(self):
+        return None
+
 
 def get_my_id():
     mac = uuid.getnode()
@@ -365,8 +377,8 @@ class OK:
                 else:
                     available_methods.append(method)
 
-        self.global_config.get_config(basic_options)
-        og.global_config = self.global_config
+        register_basic_options(self.global_config, enable_blur=callable(config.get('blur_area')))
+        og.global_config = self.global_config
         og.set_use_dml()
         try:
             import ctypes
@@ -718,7 +730,7 @@ class BaseScene:
 
 
 ## globals.py
-class OkGlobals:
+class OkGlobals:
 
     def __init__(self):
         super().__init__()
@@ -741,7 +753,7 @@ class OkGlobals:
         self.global_config = None
         logger.info(f'app path {self.app_path}')
 
-    def set_use_dml(self):
+    def set_use_dml(self):
         use_dml_txt_option = self.global_config.get_config('Basic Options').get('Use DirectML')
         use_dml = False
         if use_dml_txt_option == 'Auto':
@@ -756,7 +768,12 @@ class OkGlobals:
             window_build_number = int(window_build_number_str) if window_build_number_str.isdigit() else 0
             use_dml = window_build_number >= 18362
         logger.info(f'use_dml result is {use_dml}')
-        self.use_dml = use_dml
+        self.use_dml = use_dml
+
+    def get_overlay_view(self):
+        if self.app and hasattr(self.app, 'get_overlay_view'):
+            return self.app.get_overlay_view()
+        return None
 
     def get_trial_expire_util_str(self):
         # Convert the timestamp to a datetime object

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/Communicate.py

@@ -15,7 +15,9 @@ class Communicate(QObject):
     loading_progress = Signal(str)
     notification = Signal(str, str, bool, bool, str, object)
     executor_paused: Signal = Signal(bool)
-    screenshot = Signal(object, str, bool, object)
+    screenshot = Signal(object, str, bool, object)
+    blur_overlay = Signal(object)
+    clear_blur_overlay = Signal()
     adb_devices: Signal = Signal(bool)
     config_validation: Signal = Signal(str)
     tab = Signal(str)

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/debug/DebugTab.py

@@ -215,14 +215,12 @@ def capture(processor=None):
     if og.device_manager.capture_method is not None:
         logger.info(f'og.device_manager.capture_method {og.device_manager.capture_method}')
         try:
-            frame = og.device_manager.capture_method.get_frame()
-            if frame is not None:
-                if processor:
-                    frame = processor(frame.copy())
-                current_capture = str(og.device_manager.capture_method) + '_' + str(time.time() * 1000)
-                file_path = og.ok.screenshot.generate_screen_shot(frame, og.ok.screenshot.ui_dict,
-                                                                  og.ok.screenshot.screenshot_folder,
-                                                                  current_capture, True, None)
+            frame = og.device_manager.capture_method.get_frame()
+            if frame is not None:
+                current_capture = str(og.device_manager.capture_method) + '_' + str(time.time() * 1000)
+                file_path = og.ok.screenshot.generate_screen_shot(frame, og.ok.screenshot.ui_dict,
+                                                                  og.ok.screenshot.screenshot_folder,
+                                                                  current_capture, True, None, processor=processor)
 
                 # Use subprocess.Popen to open the file explorer and select the file
                 subprocess.Popen(r'explorer /select,"{}"'.format(file_path))

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/debug/OverlayWidget.py

@@ -1,6 +1,6 @@
-import win32api
-from PySide6.QtCore import Qt, QPoint, QTimer, QRectF, QRect
-from PySide6.QtGui import QPainter, QColor, QPen, QFont, QGuiApplication, QBrush
+import win32api
+from PySide6.QtCore import Qt, QPoint, QTimer, QRectF, QRect
+from PySide6.QtGui import QPainter, QColor, QPen, QFont, QGuiApplication, QBrush, QImage
 from PySide6.QtWidgets import QWidget
 
 from ok import Logger
@@ -37,8 +37,9 @@ class OverlayWidget(QWidget):
         self.log_font.setPointSize(10)
         screen = QGuiApplication.primaryScreen()
         self.scaling = screen.devicePixelRatio()
-        self.logs = []
-        communicate.log.connect(self.add_log)
+        self.logs = []
+        self.blur_images = []
+        communicate.log.connect(self.add_log)
 
     def add_log(self, level_no, message):
         for log in self.black_list_logs:
@@ -155,19 +156,59 @@ class OverlayWidget(QWidget):
             return 1
         return self.width() / og.device_manager.width
 
-    def paintEvent(self, event):
-        if not self.isVisible():
-            return
-        painter = QPainter(self)
-        self.paint_border(painter)
-        self.paint_boxes(painter)
-        self.paint_mouse_position(painter)
-        self.paint_logs(painter)
-        self.paint_alt_overlay(painter)
-        if og.config.get('debug_cover_uid'):
-            self.paint_uid_cover(painter)
-
-    def paint_alt_overlay(self, painter):
+    def paintEvent(self, event):
+        if not self.isVisible():
+            return
+        painter = QPainter(self)
+        self.paint_blur(painter)
+        boxes_active = getattr(self, '_boxes_enabled', True) and getattr(self, '_boxes_active', False)
+        if boxes_active:
+            self.paint_boxes(painter)
+            self.paint_border(painter)
+            self.paint_mouse_position(painter)
+            self.paint_logs(painter)
+            self.paint_alt_overlay(painter)
+            if og.config.get('debug_cover_uid'):
+                self.paint_uid_cover(painter)
+        self.paint_custom(painter)
+
+    def set_blur_patches(self, patches):
+        images = []
+        for x, y, width, height, patch in patches:
+            if patch is None or patch.size == 0:
+                continue
+            if len(patch.shape) == 2:
+                image_data = patch.copy()
+                image_format = QImage.Format_Grayscale8
+            else:
+                image_data = patch[:, :, :3][:, :, ::-1].copy()
+                image_format = QImage.Format_RGB888
+            image = QImage(image_data.data, width, height, image_data.strides[0], image_format).copy()
+            images.append((x, y, width, height, image))
+        self.blur_images = images
+        self.update()
+
+    def clear_blur_patches(self):
+        self.blur_images = []
+        self.update()
+
+    def paint_blur(self, painter):
+        frame_ratio = self.frame_ratio()
+        for x, y, width, height, image in self.blur_images:
+            painter.drawImage(QRectF(x * frame_ratio, y * frame_ratio,
+                                     width * frame_ratio, height * frame_ratio), image)
+
+    def paint_custom(self, painter):
+        for key, callback in list(getattr(self, 'custom_painters', {}).items()):
+            painter.save()
+            try:
+                callback(painter, self)
+            except Exception as e:
+                logger.warning(f'custom overlay painter {key} failed: {e}')
+            finally:
+                painter.restore()
+
+    def paint_alt_overlay(self, painter):
         if not getattr(self, '_is_alt_down', False):
             return
             

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/debug/Screenshot.py

@@ -11,7 +11,8 @@ from PySide6.QtGui import QColor
 
 from ok import Box, og
 from ok import Logger
-from ok.gui.Communicate import communicate
+from ok.gui.Communicate import communicate
+from ok.util.blur import apply_blur_areas, get_blur_algorithm
 from ok.util.file import find_first_existing_file, clear_folder, sanitize_filename, \
     get_relative_path
 
@@ -126,10 +127,10 @@ class Screenshot(QObject):
             self.generate_screen_shot(task[0], task[1], task[2], task[3], task[4], task[5])
             self.task_queue.task_done()
 
-    def generate_screen_shot(self, frame, ui_dict, folder, name, show_box, frame_box):
-        if folder is None:
-            return
-        pil_image = self.to_pil_image(frame)
+    def generate_screen_shot(self, frame, ui_dict, folder, name, show_box, frame_box, processor=None):
+        if folder is None:
+            return
+        pil_image = self.to_pil_image(frame, processor=processor)
         if pil_image is None:
             return
 
@@ -180,13 +181,17 @@ class Screenshot(QObject):
         if self.task_queue is not None:
             self.task_queue.put(None)
 
-    def to_pil_image(self, frame):
-        if frame is None:
-            return None
-        if processor := og.config.get('screenshot_processor'):
-            frame = processor(frame.copy())
-        if len(frame.shape) == 2:
-            frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
+    def to_pil_image(self, frame, processor=None):
+        if frame is None:
+            return None
+        frame = apply_blur_areas(frame, og.config.get('blur_area'),
+                                 get_blur_algorithm(getattr(og, 'global_config', None)))
+        if processor is None:
+            processor = og.config.get('screenshot_processor')
+        if processor:
+            frame = processor(frame.copy())
+        if len(frame.shape) == 2:
+            frame = cv2.cvtColor(frame, cv2.COLOR_GRAY2BGR)
         return Image.fromarray(cv2.cvtColor(frame, cv2.COLOR_BGR2RGB))
 
 

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/i18n/en_US.ts

@@ -819,12 +819,12 @@
             <translation>Choose Interaction</translation>
         </message>
         <message>
-            <source>Show Overlay</source>
-            <translation>Show Overlay</translation>
+            <source>Enable Boxes</source>
+            <translation>Enable Boxes</translation>
         </message>
         <message>
-            <source>Hide Overlay</source>
-            <translation>Hide Overlay</translation>
+            <source>Disable Boxes</source>
+            <translation>Disable Boxes</translation>
         </message>
         <message>
             <source>Show Log on Overlay</source>
@@ -1167,10 +1167,34 @@
             <source>Switch between different Windows capture methods</source>
             <translation>Switch between different Windows capture methods</translation>
         </message>
-        <message>
-            <source>Basic Options</source>
-            <translation>Basic Options</translation>
-        </message>
+        <message>
+            <source>Basic Options</source>
+            <translation>Basic Options</translation>
+        </message>
+        <message>
+            <source>Enable Blur</source>
+            <translation>Enable Blur</translation>
+        </message>
+        <message>
+            <source>Blur Game UID etc to enhance OLED life</source>
+            <translation>Blur Game UID etc to enhance OLED life</translation>
+        </message>
+        <message>
+            <source>Blur Algorithm</source>
+            <translation>Blur Algorithm</translation>
+        </message>
+        <message>
+            <source>Method used to obscure configured areas</source>
+            <translation>Method used to obscure configured areas</translation>
+        </message>
+        <message>
+            <source>Blur</source>
+            <translation>Blur</translation>
+        </message>
+        <message>
+            <source>Inpaint</source>
+            <translation>Inpaint</translation>
+        </message>
         <message>
             <source>Use DirectML</source>
             <translation>Use DirectML</translation>

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/i18n/es_ES.ts

@@ -817,12 +817,12 @@
             <translation>Elegir interacción</translation>
         </message>
         <message>
-            <source>Show Overlay</source>
-            <translation>Mostrar superposición de depuración</translation>
+            <source>Enable Boxes</source>
+            <translation>Activar cuadros</translation>
         </message>
         <message>
-            <source>Hide Overlay</source>
-            <translation>Ocultar superposición de depuración</translation>
+            <source>Disable Boxes</source>
+            <translation>Desactivar cuadros</translation>
         </message>
         <message>
             <source>Show Log on Overlay</source>
@@ -1165,10 +1165,34 @@
             <source>Switch between different Windows capture methods</source>
             <translation>Cambiar entre diferentes métodos de captura de Windows</translation>
         </message>
-        <message>
-            <source>Basic Options</source>
-            <translation>Opciones básicas</translation>
-        </message>
+        <message>
+            <source>Basic Options</source>
+            <translation>Opciones básicas</translation>
+        </message>
+        <message>
+            <source>Enable Blur</source>
+            <translation>Activar desenfoque</translation>
+        </message>
+        <message>
+            <source>Blur Game UID etc to enhance OLED life</source>
+            <translation>Desenfoca el UID del juego y otros elementos para prolongar la vida del OLED</translation>
+        </message>
+        <message>
+            <source>Blur Algorithm</source>
+            <translation>Algoritmo de ocultación</translation>
+        </message>
+        <message>
+            <source>Method used to obscure configured areas</source>
+            <translation>Método utilizado para ocultar las áreas configuradas</translation>
+        </message>
+        <message>
+            <source>Blur</source>
+            <translation>Desenfoque</translation>
+        </message>
+        <message>
+            <source>Inpaint</source>
+            <translation>Relleno inteligente</translation>
+        </message>
         <message>
             <source>Use DirectML</source>
             <translation>Usar DirectML</translation>

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/i18n/ja_JP.ts

@@ -813,12 +813,12 @@
             <translation>操作方法の選択</translation>
         </message>
         <message>
-            <source>Show Overlay</source>
-            <translation>デバッグオーバーレイを表示</translation>
+            <source>Enable Boxes</source>
+            <translation>ボックスを有効化</translation>
         </message>
         <message>
-            <source>Hide Overlay</source>
-            <translation>デバッグオーバーレイを隠す</translation>
+            <source>Disable Boxes</source>
+            <translation>ボックスを無効化</translation>
         </message>
         <message>
             <source>Show Log on Overlay</source>
@@ -1157,10 +1157,34 @@
             <source>Switch between different Windows capture methods</source>
             <translation>異なる Windows キャプチャ方式を切り替える</translation>
         </message>
-        <message>
-            <source>Basic Options</source>
-            <translation>基本オプション</translation>
-        </message>
+        <message>
+            <source>Basic Options</source>
+            <translation>基本オプション</translation>
+        </message>
+        <message>
+            <source>Enable Blur</source>
+            <translation>ぼかしを有効化</translation>
+        </message>
+        <message>
+            <source>Blur Game UID etc to enhance OLED life</source>
+            <translation>ゲーム UID などをぼかして OLED の寿命を延ばします</translation>
+        </message>
+        <message>
+            <source>Blur Algorithm</source>
+            <translation>マスク処理方式</translation>
+        </message>
+        <message>
+            <source>Method used to obscure configured areas</source>
+            <translation>設定領域を隠すための処理方式</translation>
+        </message>
+        <message>
+            <source>Blur</source>
+            <translation>ぼかし</translation>
+        </message>
+        <message>
+            <source>Inpaint</source>
+            <translation>インペイント</translation>
+        </message>
         <message>
             <source>Use DirectML</source>
             <translation>DirectMLを使用</translation>

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/i18n/ko_KR.ts

@@ -818,12 +818,12 @@
             <translation>상호 작용 선택</translation>
         </message>
         <message>
-            <source>Show Overlay</source>
-            <translation>디버그 오버레이 표시</translation>
+            <source>Enable Boxes</source>
+            <translation>박스 사용</translation>
         </message>
         <message>
-            <source>Hide Overlay</source>
-            <translation>디버그 오버레이 숨기기</translation>
+            <source>Disable Boxes</source>
+            <translation>박스 사용 안 함</translation>
         </message>
         <message>
             <source>Show Log on Overlay</source>
@@ -1166,10 +1166,34 @@
             <source>Switch between different Windows capture methods</source>
             <translation>다양한 Windows 캡처 방식 간에 전환</translation>
         </message>
-        <message>
-            <source>Basic Options</source>
-            <translation>기본 옵션</translation>
-        </message>
+        <message>
+            <source>Basic Options</source>
+            <translation>기본 옵션</translation>
+        </message>
+        <message>
+            <source>Enable Blur</source>
+            <translation>블러 사용</translation>
+        </message>
+        <message>
+            <source>Blur Game UID etc to enhance OLED life</source>
+            <translation>게임 UID 등을 흐리게 표시하여 OLED 수명을 늘립니다</translation>
+        </message>
+        <message>
+            <source>Blur Algorithm</source>
+            <translation>가림 알고리즘</translation>
+        </message>
+        <message>
+            <source>Method used to obscure configured areas</source>
+            <translation>설정된 영역을 가리는 처리 방법</translation>
+        </message>
+        <message>
+            <source>Blur</source>
+            <translation>블러</translation>
+        </message>
+        <message>
+            <source>Inpaint</source>
+            <translation>인페인트</translation>
+        </message>
         <message>
             <source>Use DirectML</source>
             <translation>DirectML 사용</translation>

{ok_script-1.0.140 → ok_script-1.0.142}/ok/gui/i18n/zh_CN.ts

@@ -819,12 +819,12 @@
             <translation>选择交互方式</translation>
         </message>
         <message>
-            <source>Show Overlay</source>
-            <translation>显示调试悬浮窗</translation>
+            <source>Enable Boxes</source>
+            <translation>启用标记框</translation>
         </message>
         <message>
-            <source>Hide Overlay</source>
-            <translation>隐藏调试悬浮窗</translation>
+            <source>Disable Boxes</source>
+            <translation>禁用标记框</translation>
         </message>
         <message>
             <source>Show Log on Overlay</source>
@@ -1163,10 +1163,34 @@
             <source>Switch between different Windows capture methods</source>
             <translation>切换不同的 Windows 截图方式</translation>
         </message>
-        <message>
-            <source>Basic Options</source>
-            <translation>基本设置</translation>
-        </message>
+        <message>
+            <source>Basic Options</source>
+            <translation>基本设置</translation>
+        </message>
+        <message>
+            <source>Enable Blur</source>
+            <translation>启用模糊遮挡</translation>
+        </message>
+        <message>
+            <source>Blur Game UID etc to enhance OLED life</source>
+            <translation>模糊游戏 UID 等固定内容以延长 OLED 屏幕寿命</translation>
+        </message>
+        <message>
+            <source>Blur Algorithm</source>
+            <translation>遮挡算法</translation>
+        </message>
+        <message>
+            <source>Method used to obscure configured areas</source>
+            <translation>用于遮挡配置区域的处理方式</translation>
+        </message>
+        <message>
+            <source>Blur</source>
+            <translation>模糊</translation>
+        </message>
+        <message>
+            <source>Inpaint</source>
+            <translation>内容填充</translation>
+        </message>
         <message>
             <source>Use DirectML</source>
             <translation>使用DirectML</translation>