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

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

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

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

@@ -28,75 +28,73 @@ class OK:
         ok.gui.ok = self
         self.debug = config.get("debug", False)
         self.exit_event = threading.Event()
-        self.config = config
-        self.init_device_manager()
-        from ok.gui.debug.Screenshot import Screenshot
-        self.screenshot = Screenshot()
-        if config.get("use_gui"):
-            from ok.gui.App import App
-            self.app = App(config, self.exit_event)
-            ok.gui.app = self.app
-        else:
-            self.device_manager.set_preferred_device()
-            self.device_manager.start()
-            self.do_init()
+        try:
+            self.config = config
+            self.init_device_manager()
+            from ok.gui.debug.Screenshot import Screenshot
+            self.screenshot = Screenshot()
+            if config.get("use_gui"):
+                from ok.gui.App import App
+                self.app = App(config, self.exit_event)
+                ok.gui.app = self.app
+            else:
+                self.device_manager.set_preferred_device()
+                self.device_manager.start()
+                self.do_init()
+        except Exception as e:
+            self.exit_event.set()
+            raise e
 
     def start(self):
-        if self.config.get("use_gui"):
-            self.do_init()
-            self.app.show_main_window()
-            self.app.exec()
-        else:
-            self.task_executor.start()
-            if self.config.get("debug"):
-                self.app = QApplication(sys.argv)
-                from ok.gui.overlay.OverlayWindow import OverlayWindow
-                self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
+        try:
+            if self.config.get("use_gui"):
+                self.do_init()
+                self.app.show_main_window()
                 self.app.exec()
             else:
-                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.start()
-
-                    # Wait for the task thread to end (which it won't, in this case, without an interrupt)
-                    task_thread.join()
-                except KeyboardInterrupt:
-                    self.exit_event.set()
-                    logger.info("Keyboard interrupt received, exiting script.")
-                finally:
-                    # Clean-up code goes here (if any)
-                    # This block ensures that the script terminates gracefully,
-                    # releasing resources or performing necessary clean-up operations.
-                    logger.info("Script has terminated.")
-
-    def init_message(self, message: str, done=False):
-        ok.gui.Communicate.communicate.init.emit(done, message)
-        if self.exit_event.is_set():
-            self.worker.quit()
+                self.task_executor.start()
+                if self.config.get("debug"):
+                    self.app = QApplication(sys.argv)
+                    from ok.gui.overlay.OverlayWindow import OverlayWindow
+                    self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
+                    self.app.exec()
+                else:
+                    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.start()
+
+                        # Wait for the task thread to end (which it won't, in this case, without an interrupt)
+                        task_thread.join()
+                    except KeyboardInterrupt:
+                        self.exit_event.set()
+                        logger.info("Keyboard interrupt received, exiting script.")
+                    finally:
+                        # Clean-up code goes here (if any)
+                        # This block ensures that the script terminates gracefully,
+                        # releasing resources or performing necessary clean-up operations.
+                        logger.info("Script has terminated.")
+        except Exception as e:
+            logger.error("start error", e)
+            self.exit_event.set()
 
     def do_init(self):
         logger.info(f"initializing {self.__class__.__name__}, config: {self.config}")
         if self.config.get('ocr'):
-            self.init_message("RapidOCR init Start")
             from rapidocr_onnxruntime import RapidOCR
             self.ocr = RapidOCR()
-            self.init_message("RapidOCR init Complete")
 
         config_logger(self.config)
 
         if self.config.get('coco_feature_folder') is not None:
-            self.init_message("FeatureSet init Start")
             coco_feature_folder = self.config.get('coco_feature_folder')
             from ok.feature.FeatureSet import FeatureSet
             self.feature_set = FeatureSet(coco_feature_folder,
                                           default_horizontal_variance=self.config.get('default_horizontal_variance', 0),
                                           default_vertical_variance=self.config.get('default_vertical_variance', 0),
                                           default_threshold=self.config.get('default_threshold', 0))
-            self.init_message("FeatureSet init Complete")
 
-        self.init_message("TaskExecutor init Start")
         from ok.task.TaskExecutor import TaskExecutor
         self.task_executor = TaskExecutor(self.device_manager, exit_event=self.exit_event,
                                           onetime_tasks=self.config.get('onetime_tasks', []),
@@ -104,7 +102,6 @@ class OK:
                                           scenes=self.config['scenes'],
                                           feature_set=self.feature_set,
                                           ocr=self.ocr, config_folder=self.config.get("config_folder") or "config")
-        self.init_message("TaskExecutor init Done")
 
         if self.app:
             ok.gui.executor = self.task_executor

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

@@ -126,9 +126,9 @@ class DeviceManager:
             if imei not in adb_connected and self.device_dict[imei]['device'] == 'adb':
                 self.device_dict[imei]['connected'] = False
 
-        communicate.adb_devices.emit(True)
         self.config.save_file()
         self.start()
+        communicate.adb_devices.emit(True)
         logger.debug(f'refresh {self.device_dict}')
 
     def set_preferred_device(self, imei=None):
@@ -144,6 +144,7 @@ class DeviceManager:
             self.config.save_file()
         logger.debug(f'preferred device: {preferred}')
         self.start()
+        return preferred
 
     def get_preferred_device(self):
         imei = self.config.get("preferred")
@@ -178,7 +179,10 @@ class DeviceManager:
     def start(self):
         preferred = self.get_preferred_device()
         if preferred is None:
+            if self.device_dict:
+                self.set_preferred_device()
             return
+
         if preferred['device'] == 'windows':
             self.ensure_hwnd(self.hwnd_title, self.exe_name)
             if not isinstance(self.capture_method, WindowsGraphicsCaptureMethod):

{ok-script-0.0.14 → ok-script-0.0.16}/ok/gui/Communicate.py

@@ -12,7 +12,6 @@ class Communicate(QObject):
     task_info = Signal()
     window = Signal(bool, int, int, int, int, int, int, float)
     loading_progress = Signal(str)
-    init = Signal(bool, str)
     notification = Signal(str, str)
     executor_paused: Signal = Signal(bool)
     screenshot = Signal(np.ndarray, str)

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

@@ -136,7 +136,8 @@ class Screenshot(QObject):
         pil_image.save(file)
 
     def stop(self):
-        self.task_queue.put(None)
+        if self.task_queue is not None:
+            self.task_queue.put(None)
 
     def to_pil_image(self, frame):
         if frame is None: