ok-script 0.0.13__tar.gz → 0.0.14__tar.gz

{ok-script-0.0.13 → ok-script-0.0.14}/PKG-INFO

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

{ok-script-0.0.13 → ok-script-0.0.14}/ok/OK.py

@@ -57,7 +57,7 @@ class OK:
                 try:
                     # Starting the task in a separate thread (optional)
                     # This allows the main thread to remain responsive to keyboard interrupts
-                    task_thread = threading.Thread(target=self.wait_task())
+                    task_thread = threading.Thread(target=self.wait_task)
                     task_thread.start()
 
                     # Wait for the task thread to end (which it won't, in this case, without an interrupt)
@@ -113,6 +113,10 @@ class OK:
         while not self.exit_event.is_set():
             time.sleep(1)
 
+    def quit(self):
+        self.screenshot.stop()
+        self.exit_event.set()
+
     def init_device_manager(self):
         if self.device_manager is None:
             from ok.capture.adb.DeviceManager import DeviceManager

{ok-script-0.0.13 → ok-script-0.0.14}/ok/capture/HwndWindow.py

@@ -34,7 +34,7 @@ class HwndWindow:
     exists = False
     title = None
 
-    def __init__(self, title="", exe_name=None, exit_event=threading.Event(), frame_width=0, frame_height=0):
+    def __init__(self, exit_event, title="", exe_name=None, frame_width=0, frame_height=0):
         super().__init__()
         self.app_exit_event = exit_event
         self.exe_name = exe_name

{ok-script-0.0.13 → ok-script-0.0.14}/ok/capture/adb/ADBCaptureMethod.py

@@ -50,6 +50,8 @@ class ADBCaptureMethod(BaseCaptureMethod):
         return frame
 
     def connected(self):
+        if not self._connected and self.device is not None:
+            self.screencap()
         return self._connected and self.device is not None
 
 

{ok-script-0.0.13 → ok-script-0.0.14}/ok/capture/adb/DeviceManager.py

@@ -30,7 +30,7 @@ class DeviceManager:
         self.interaction = None
         self.exit_event = exit_event
         if hwnd_title is not None:
-            self.hwnd = HwndWindow(hwnd_title, exe_name, exit_event)
+            self.hwnd = HwndWindow(exit_event, hwnd_title, exe_name)
         self.config = Config({"devices": {}, "preferred": "none"}, config_folder, "DeviceManager")
         self.thread = None
         self.capture_method = None
@@ -170,7 +170,7 @@ class DeviceManager:
 
     def ensure_hwnd(self, title, exe, frame_width=0, frame_height=0):
         if self.hwnd is None:
-            self.hwnd = HwndWindow(title, exe, self.exit_event, frame_width, frame_height)
+            self.hwnd = HwndWindow(self.exit_event, title, exe, frame_width, frame_height)
         else:
             self.hwnd.update_frame_size(frame_width, frame_height)
             self.hwnd.update_title_and_exe(title, exe)

{ok-script-0.0.13 → ok-script-0.0.14}/ok/gui/MainWindow.py

@@ -82,8 +82,8 @@ class MainWindow(MSFluentWindow):
         w = MessageBox(title, content, self.window())
         w.setContentCopyable(True)
         if w.exec():
-            self.exit_event.set()
-            event.accept()
             logger.info("Window closed")
+            ok.gui.ok.quit()
+            event.accept()
         else:
             event.ignore()

{ok-script-0.0.13 → ok-script-0.0.14}/ok/gui/debug/Screenshot.py

@@ -37,7 +37,7 @@ class Screenshot(QObject):
         self.screenshot_folder = get_path_relative_to_exe(ok.gui.ok.config.get("screenshots_folder"))
         if self.click_screenshot_folder is not None or self.screenshot_folder is not None:
             self.task_queue = queue.Queue()
-            self.thread = threading.Thread(target=self._worker)
+            self.thread = threading.Thread(target=self._worker, name="screenshot")
             self.thread.start()
             fonts_dir = os.path.join(os.environ['WINDIR'], 'Fonts')
             font = find_first_existing_file(
@@ -54,7 +54,7 @@ class Screenshot(QObject):
             self.task_queue = None
 
     def screenshot(self, frame, name):
-        if self.screenshot_folder is not None:
+        if self.screenshot_folder is not None and frame is not None:
             self.add_task(frame, self.screenshot_folder, name)
 
     def draw_box(self, key: str = None, boxes=None, color="red", frame=None):
@@ -93,6 +93,7 @@ class Screenshot(QObject):
         while True and not self.exit_event.is_set():
             task = self.task_queue.get()
             if task is None:
+                logger.debug("Task queue get is None quit")
                 break
             # Execute the task
             self.generate_screen_shot(task[0], task[1], task[2], task[3])
@@ -134,7 +135,10 @@ class Screenshot(QObject):
         file = os.path.join(folder, f"{time_string}.png")
         pil_image.save(file)
 
+    def stop(self):
+        self.task_queue.put(None)
+
     def to_pil_image(self, frame):
-        if not self.click_screenshot_folder or frame is None:
+        if frame is None:
             return None
         return Image.fromarray(cv2.cvtColor(frame, cv2.COLOR_BGR2RGB))

{ok-script-0.0.13 → ok-script-0.0.14}/ok/task/TaskExecutor.py

@@ -167,6 +167,9 @@ class TaskExecutor:
         self.current_scene = None
 
     def next_task(self):
+        if self.exit_event.is_set():
+            logger.error(f"next_task exit_event.is_set exit")
+            return None, False
         cycled = False
         for onetime_task in self.onetime_tasks:
             if onetime_task.enabled:

{ok-script-0.0.13 → ok-script-0.0.14}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.13 → ok-script-0.0.14}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.13",
+    version="0.0.14",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",