ok-script 0.0.39__tar.gz → 0.0.41__tar.gz

{ok-script-0.0.39 → ok-script-0.0.41}/PKG-INFO

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

{ok-script-0.0.39 → ok-script-0.0.41}/ok/OK.py

@@ -34,7 +34,7 @@ class OK:
             self.config = config
             self.init_device_manager()
             from ok.gui.debug.Screenshot import Screenshot
-            self.screenshot = Screenshot()
+            self.screenshot = Screenshot(self.exit_event)
             if config.get("use_gui"):
                 from ok.gui.App import App
                 self.app = App(config, self.exit_event)
@@ -123,7 +123,8 @@ class OK:
     def quit(self):
         logger.debug('quit app')
         self.exit_event.set()
-        self.device_manager.stop()
+        if self.device_manager is not None:
+            self.device_manager.stop()
         if self.app:
             self.app.quit()
 

{ok-script-0.0.39 → ok-script-0.0.41}/ok/capture/HwndWindow.py

@@ -11,7 +11,6 @@ from win32 import win32gui
 from ok.capture.windows.window import is_foreground_window, get_window_bounds
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
-from ok.util.exit_event import ExitEvent
 
 logger = get_logger(__name__)
 
@@ -41,7 +40,7 @@ class HwndWindow:
         super().__init__()
         self.app_exit_event = exit_event
         self.exe_name = exe_name
-        self.stop_event = ExitEvent()
+        self.stop_event = threading.Event()
         self.update_title_re(title)
         self.visible = False
         self.update_frame_size(frame_width, frame_height)

{ok-script-0.0.39 → ok-script-0.0.41}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -32,7 +32,7 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
     description = "fast, most compatible, capped at 60fps"
     last_frame = None
     last_frame_time = 0
-    hwnd_window: HwndWindow = None
+    _hwnd_window: HwndWindow = None
     frame_pool = None
     item = None
     session = None
@@ -42,7 +42,7 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
 
     def __init__(self, hwnd_window: HwndWindow):
         super().__init__()
-        self.hwnd_window = hwnd_window
+        self._hwnd_window = hwnd_window
         self.start_or_stop()
 
     def frame_arrived_callback(self, x, y):
@@ -108,6 +108,15 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
                 return self.get_frame()
         self.last_frame = img
 
+    @property
+    def hwnd_window(self):
+        return self._hwnd_window
+
+    @hwnd_window.setter
+    def hwnd_window(self, hwnd_window):
+        self._hwnd_window = hwnd_window
+        self.start_or_stop()
+
     def connected(self):
         return self.hwnd_window is not None and self.hwnd_window.exists
 

{ok-script-0.0.39 → ok-script-0.0.41}/ok/config/Config.py

@@ -1,16 +1,18 @@
+from ok.gui.Communicate import communicate
 from ok.util.json import read_json_file, write_json_file
 from ok.util.path import get_path_relative_to_exe
 
 
 class Config:
-    def __init__(self, default, folder, name):
+    def __init__(self, default, folder, name, validator=None):
         super().__init__()
         self.default = default
+        self.validator = validator
         self.config_file = get_path_relative_to_exe(folder, f"{name}.json")
         self.config = read_json_file(self.config_file)
         if self.config is None:
             self.config = default
-        elif verify_config(self.config, default):
+        elif self.verify_config(self.config, default):
             self.save_file()
 
     def save_file(self):
@@ -60,26 +62,39 @@ class Config:
         return len(self.config)
 
     def __setitem__(self, key, value):
-        self.config[key] = value
-        self.save_file()
+        if self.validate(key, value):
+            self.config[key] = value
+            self.save_file()
 
     def __getitem__(self, key):
         return self.config[key]
 
-
-def verify_config(config, default_config):
-    modified = False
-
-    # Remove entries that do not exist in default_config
-    for key in list(config.keys()):
-        if key not in default_config:
-            del config[key]
-            modified = True
-
-    # Check entries in default_config
-    for key, default_value in default_config.items():
-        if key not in config or type(config[key]) != type(default_value):
-            config[key] = default_value
-            modified = True
-
-    return not modified
+    def validate(self, key, value):
+        if self.validator is not None:
+            valid, message = self.validator(key, value)
+            if not valid:
+                communicate.config_validation.emit(message)
+                return False
+        return True
+
+    def verify_config(self, config, default_config):
+        modified = False
+
+        # Remove entries that do not exist in default_config
+        for key in list(config.keys()):
+            if key not in default_config:
+                del config[key]
+                modified = True
+
+        # Check entries in default_config
+        for key, default_value in default_config.items():
+            if key not in config or type(config[key]) != type(default_value):
+                config[key] = default_value
+                modified = True
+            elif self.validator is not None:
+                valid = self.validate(key, self.config[key])
+                if not valid:
+                    config[key] = default_value
+                    modified = True
+
+        return not modified

{ok-script-0.0.39 → ok-script-0.0.41}/ok/gui/App.py

@@ -68,9 +68,10 @@ class App:
         message_window.show()
 
     def show_path_ascii_error(self, path):
-        title = self.app.tr('Error')
-        content = self.app.tr(
-            "Install dir ") + path + self.app.tr(" must be an English path, move to another path.")
+        title = QCoreApplication.translate("app", 'Error')
+        content = QCoreApplication.translate("app",
+                                             "Install dir {path} must be an English path, move to another path.").format(
+            path=path)
         self.show_message_window(title, content)
 
     def show_main_window(self):

{ok-script-0.0.39 → ok-script-0.0.41}/ok/gui/Communicate.py

@@ -17,6 +17,7 @@ class Communicate(QObject):
     screenshot = Signal(np.ndarray, str)
     update_overlay = Signal()
     adb_devices: Signal = Signal(bool)
+    config_validation: Signal = Signal(str)
     tab = Signal(str)
     capture_error = Signal()
 

{ok-script-0.0.39 → ok-script-0.0.41}/ok/gui/MainWindow.py

@@ -67,6 +67,20 @@ class MainWindow(MSFluentWindow):
 
         communicate.capture_error.connect(self.capture_error)
         communicate.notification.connect(self.show_notification)
+        communicate.config_validation.connect(self.config_validation)
+
+    def config_validation(self, message):
+        title = self.tr('Error')
+        InfoBar.error(
+            title=title,
+            content=message,
+            orient=Qt.Horizontal,
+            isClosable=True,
+            position=InfoBarPosition.TOP,
+            duration=5000,  # won't disappear automatically
+            parent=self.window()
+        )
+        self.tray.showMessage(title, message)
 
     def show_notification(self, message, title=None, error=None):
         bar = InfoBar.error if error else InfoBar.info

{ok-script-0.0.39 → ok-script-0.0.41}/ok/gui/debug/Screenshot.py

@@ -20,10 +20,9 @@ logger = get_logger(__name__)
 
 class Screenshot(QObject):
 
-    def __init__(self):
+    def __init__(self, exit_event):
         super().__init__()
         self.queue = []
-        self.exit_event = ok.gui.ok.exit_event
         self.time_to_expire = 3
         self.ui_dict = {}
         self.color_map = {
@@ -31,10 +30,13 @@ class Screenshot(QObject):
             "green": QColor(0, 255, 0),  # RGB for green
             "blue": QColor(0, 0, 255)  # RGB for blue
         }
+        self.exit_event = exit_event
         communicate.draw_box.connect(self.draw_box)
         communicate.screenshot.connect(self.screenshot)
         self.click_screenshot_folder = get_path_relative_to_exe(ok.gui.ok.config.get("click_screenshots_folder"))
         self.screenshot_folder = get_path_relative_to_exe(ok.gui.ok.config.get("screenshots_folder"))
+        logger.debug(f"init Screenshot {self.screenshot_folder} {self.click_screenshot_folder}")
+        print(f"init Screenshot {self.screenshot_folder} {self.screenshot_folder}")
         if self.click_screenshot_folder is not None or self.screenshot_folder is not None:
             self.task_queue = queue.Queue()
             self.exit_event.bind_queue(self.task_queue)
@@ -106,6 +108,7 @@ class Screenshot(QObject):
         pil_image = self.to_pil_image(frame)
         if pil_image is None:
             return
+        self.save_pil_image(name + '_original', folder, pil_image)
         # Ensure no fill
         draw = ImageDraw.Draw(pil_image)
 
@@ -127,6 +130,11 @@ class Screenshot(QObject):
                 # Put text
                 draw.text((x, y + height + 8), f"{box.name or key}_{round(box.confidence * 100)}", fill=color,
                           font=self.pil_font)
+        self.save_pil_image(name + '_boxed', folder, pil_image)
+
+    def save_pil_image(self, name, folder, pil_image):
+
+        logger.debug(f'save_pil_image {name}, {folder}')
         now = datetime.now()
 
         # Convert to string with milliseconds
@@ -142,6 +150,7 @@ class Screenshot(QObject):
             pil_image.save(os.path.join(folder, f"{time_string}.png"))
 
     def stop(self):
+        logger.debug(f'stop screenshot')
         if self.task_queue is not None:
             self.task_queue.put(None)