ok-script 0.0.76__tar.gz → 0.0.78__tar.gz

{ok-script-0.0.76 → ok-script-0.0.78}/PKG-INFO

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

{ok-script-0.0.76 → ok-script-0.0.78}/ok/OK.py

@@ -27,6 +27,7 @@ class OK:
     app = None
     screenshot = None
     exit_event = ExitEvent()
+    init_error = None
 
     def __init__(self, config: Dict[str, Any]):
         print(f"AutoHelper init, config: {config}")
@@ -57,7 +58,8 @@ class OK:
     def start(self):
         try:
             if self.config.get("use_gui"):
-                self.app.show_main_window()
+                if not self.init_error:
+                    self.app.show_main_window()
                 self.app.exec()
             else:
                 self.task_executor.start()
@@ -91,14 +93,6 @@ class OK:
 
     def do_init(self):
         logger.info(f"initializing {self.__class__.__name__}, config: {self.config}")
-        if self.config.get('ocr'):
-            isascii, path = install_path_isascii()
-            if not isascii:
-                self.app.show_path_ascii_error(path)
-                return False
-            from rapidocr_openvino import RapidOCR
-            inference_num_threads = self.config.get('ocr').get('inference_num_threads', -1)
-            self.ocr = RapidOCR(inference_num_threads=inference_num_threads)
 
         template_matching = self.config.get('template_matching')
         if template_matching is not None:
@@ -117,10 +111,21 @@ class OK:
                                           trigger_tasks=self.config.get('trigger_tasks', []),
                                           scenes=self.config['scenes'],
                                           feature_set=self.feature_set,
-                                          ocr=self.ocr, config_folder=self.config.get("config_folder"))
+                                          config_folder=self.config.get("config_folder"))
 
         ok.gui.executor = self.task_executor
 
+        if self.config.get('ocr'):
+            isascii, path = install_path_isascii()
+            if not isascii:
+                self.app.show_path_ascii_error(path)
+                self.init_error = True
+                return False
+            from rapidocr_openvino import RapidOCR
+            inference_num_threads = self.config.get('ocr').get('inference_num_threads', -1)
+            self.ocr = RapidOCR(inference_num_threads=inference_num_threads)
+            self.task_executor.ocr = self.ocr
+
         return True
 
     def wait_task(self):

{ok-script-0.0.76 → ok-script-0.0.78}/ok/capture/HwndWindow.py

@@ -186,8 +186,9 @@ def find_hwnd(title, exe_name, frame_width, frame_height):
                 biggest = result
         x_offset = 0
         y_offset = 0
-        real_width, real_height = biggest[2], biggest[3]
+        real_width, real_height = 0, 0
         if biggest is not None and frame_aspect_ratio != 0:
+            real_width, real_height = biggest[2], biggest[3]
             matching_child = enum_child_windows(biggest, frame_aspect_ratio)
             if matching_child is not None:
                 x_offset, y_offset, real_width, real_height = matching_child

{ok-script-0.0.76 → ok-script-0.0.78}/ok/capture/adb/DeviceManager.py

@@ -280,7 +280,7 @@ class DeviceManager:
         communicate.adb_devices.emit(True)
 
     def update_resolution_for_hwnd(self):
-        if self.hwnd is not None and self.hwnd.frame_aspect_ratio == 0:
+        if self.hwnd is not None and self.hwnd.frame_aspect_ratio == 0 and self.adb_capture_config:
             width, height = self.get_resolution()
             logger.debug(f'update resolution for {self.hwnd} {width}x{height}')
             self.hwnd.update_frame_size(width, height)

{ok-script-0.0.76 → ok-script-0.0.78}/ok/feature/FeatureSet.py

@@ -105,7 +105,8 @@ class FeatureSet:
                 self.feature_dict[category_name] = Feature(image, x, y, w, h)
             self.box_dict[category_name] = Box(x, y, w, h, name=category_name)
 
-    def get_box_by_name(self, category_name: str) -> Box:
+    def get_box_by_name(self, mat, category_name: str) -> Box:
+        self.check_size(mat)
         if category_name in self.box_dict:
             return self.box_dict[category_name]
         else:

{ok-script-0.0.76 → ok-script-0.0.78}/ok/feature/FindFeature.py

@@ -18,7 +18,7 @@ class FindFeature:
                                              threshold, use_gray_scale, x, y, to_x, to_y, width, height)
 
     def get_box_by_name(self, name):
-        return self.feature_set.get_box_by_name(name)
+        return self.feature_set.get_box_by_name(self.executor.frame, name)
 
     def find_feature_and_set(self, features, horizontal_variance=0, vertical_variance=0, threshold=0):
         ret = True

{ok-script-0.0.76 → ok-script-0.0.78}/ok/gui/MainWindow.py

@@ -2,12 +2,10 @@ import os
 import sys
 
 from PySide6.QtCore import QObject, Signal, Qt
-from PySide6.QtGui import QKeySequence, QShortcut
 from PySide6.QtWidgets import QMenu, QSystemTrayIcon
 from qfluentwidgets import FluentIcon, NavigationItemPosition, MSFluentWindow, InfoBar, InfoBarPosition, MessageBox
 
 import ok.gui
-from ok.capture.windows.dump import dump_threads
 from ok.gui.Communicate import communicate
 from ok.gui.about.AboutTab import AboutTab
 from ok.gui.debug.DebugTab import DebugTab
@@ -68,8 +66,6 @@ class MainWindow(MSFluentWindow):
         communicate.executor_paused.connect(self.executor_paused)
         communicate.tab.connect(self.navigate_tab)
 
-      
-
         # Create a context menu for the tray
         menu = QMenu()
         exit_action = menu.addAction(self.tr("Exit"))
@@ -168,9 +164,9 @@ class MainWindow(MSFluentWindow):
         # Create a message box that asks the user if they really want to close the window
         if sys.platform == 'win32' and 'shutdown' in os.environ.get('SESSIONNAME', '').lower():
             event.accept()
+            ok.gui.ok.quit()
             return
 
-            # Your existing code for the message box
         if ok.gui.ok.exit_event.is_set():
             event.accept()
             return
@@ -179,7 +175,7 @@ class MainWindow(MSFluentWindow):
         w = MessageBox(title, content, self.window())
         if w.exec():
             logger.info("Window closed")
-            ok.gui.ok.quit()
             event.accept()
+            ok.gui.ok.quit()
         else:
             event.ignore()

{ok-script-0.0.76 → ok-script-0.0.78}/ok/gui/debug/DebugTab.py

@@ -1,9 +1,8 @@
 import subprocess
 from ctypes import windll, wintypes
 
-from PySide6.QtCore import Qt, Signal, QEvent
-from PySide6.QtGui import QShortcut, QKeySequence
-from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout, QMessageBox
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout
 from _ctypes import byref
 from qfluentwidgets import PushButton, FlowLayout, ComboBox, SearchLineEdit, TextEdit
 
@@ -124,9 +123,9 @@ class DebugTab(Tab):
         VK_S = 0x53
 
         if not windll.user32.RegisterHotKey(None, 1, MOD_ALT | MOD_CONTROL, VK_D):
-            print("Failed to register hotkey for Alt+Ctrl+D")
+            logger.debug("Failed to register hotkey for Alt+Ctrl+D")
         if not windll.user32.RegisterHotKey(None, 2, MOD_ALT | MOD_CONTROL, VK_S):
-            print("Failed to register hotkey for Alt+Ctrl+S")
+            logger.debug("Failed to register hotkey for Alt+Ctrl+S")
         logger.debug('bind_hot_keys')
 
     def __del__(self):

{ok-script-0.0.76 → ok-script-0.0.78}/ok/ocr/OCR.py

@@ -51,6 +51,7 @@ class OCR:
                 time.sleep(3)
                 result, _ = self.executor.ocr(image, use_det=True, use_cls=False, use_rec=True)
             detected_boxes = []
+            ocr_boxes = None
             # Process the results and create Box objects
             if result is not None:
                 for res in result:
@@ -70,6 +71,7 @@ class OCR:
                             detected_box.x += box.x
                             detected_box.y += box.y
                         detected_boxes.append(detected_box)
+                        ocr_boxes = detected_boxes
                 if match is not None:
                     detected_boxes = find_boxes_by_name(detected_boxes, match)
 
@@ -77,6 +79,8 @@ class OCR:
             communicate.emit_draw_box("ocr_zone", box, "blue")
             logger.debug(
                 f"ocr_zone {box} found result: {len(detected_boxes)}) time: {(time.time() - start):.2f} scale_factor: {scale_factor:.2f}")
+            if not detected_boxes and ocr_boxes:
+                logger.info(f'ocr detected but no match: {match} {ocr_boxes}')
             return sort_boxes(detected_boxes)
 
     def wait_click_ocr(self, x=0, y=0, to_x=1, to_y=1, width=0, height=0, box=None, name=None,

{ok-script-0.0.76 → ok-script-0.0.78}/ok/task/ExecutorOperation.py

@@ -1,6 +1,7 @@
 import queue
 from typing import List
 
+from ok.color.Color import calculate_color_percentage
 from ok.feature.Box import Box, find_box_by_name, relative_box
 from ok.gui.Communicate import communicate
 
@@ -163,5 +164,11 @@ class ExecutorOperation:
     def draw_boxes(feature_name=None, boxes=None, color="red"):
         communicate.emit_draw_box(feature_name, boxes, color)
 
+    def calculate_color_percentage(self, color, box: Box):
+        percentage = calculate_color_percentage(self.frame, color, box)
+        box.confidence = percentage
+        self.draw_boxes(box.name, box)
+        return percentage
+
     def adb_shell(self, *args, **kwargs):
         return self.executor.device_manager.shell(*args, **kwargs)

{ok-script-0.0.76 → ok-script-0.0.78}/ok/update/GithubMultiDownloader.py

@@ -55,13 +55,14 @@ class GithubMultiDownloader:
                 downloaded = os.path.getsize(file)
                 if downloaded == part_size:
                     logger.info(f'File {file} already downloaded')
+                    self.downloaded += part_size
                     return
                 elif downloaded > part_size:
                     logger.warning(f'File size error {file} {downloaded} > {part_size}')
                     os.remove(file)
                 else:
                     part_start += downloaded
-                self.downloaded += part_size
+                    self.downloaded += downloaded
 
         target_size = end - part_start + 1
 
@@ -117,6 +118,12 @@ class GithubMultiDownloader:
                             response.close()
                             logger.debug('switch to fast proxy')
                             break
+                if part_downloaded == target_size:
+                    logger.debug("download_part finished")
+                    return
+                else:
+                    logger.warning(f'download_part size failed {part_downloaded} {target_size}')
+                return True
         except Exception as e:
             with self.lock:
                 if proxy in self.proxys:

{ok-script-0.0.76 → ok-script-0.0.78}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.76 → ok-script-0.0.78}/setup.py

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