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

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

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

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

@@ -126,6 +126,8 @@ class DeviceManager:
                     self.device_dict[imei] = phone_device
 
     def refresh_emulators(self):
+        if self.adb_capture_config is None:
+            return
         from ok.alas.emulator_windows import EmulatorManager
         manager = EmulatorManager()
         installed_emulators = manager.all_emulator_instances
@@ -370,7 +372,7 @@ class DeviceManager:
                 packages = [packages]
             for package in packages:
                 if package == front.package:
-                    return package
+                    return False
 
     def adb_start_package(self, package):
         self.shell(f'monkey -p {package} -c android.intent.category.LAUNCHER 1')

{ok-script-0.0.74 → ok-script-0.0.76}/ok/firebase/Analytics.py

@@ -7,6 +7,7 @@ import uuid
 import requests
 import wmi
 
+import ok.gui
 from ok.config.Config import Config
 from ok.logging.Logger import get_logger
 from ok.util.Handler import Handler
@@ -58,11 +59,20 @@ class Analytics:
             self._user_properties = {
                 "os": 'windows',
                 "os_version": os_version,
-                "os_build": os_build,
+                "os_build": str(os_build),
                 "cpu": cpu_name,
-                "memory": int(total_memory),
+                "memory": str(int(total_memory)),
                 "gpu": gpu_name,
             }
+            config = ok.gui.device_manager.config
+            if config:
+                self._user_properties["device"] = config.get('preferred')
+                self._user_properties["device_capture"] = config.get('capture')
+            capture = ok.gui.device_manager.capture_method
+            if capture:
+                width, height = ok.gui.device_manager.capture_method._size
+                if width and height:
+                    self._user_properties["device_sr"] = f'{width}x{height}'
         return self._user_properties
 
     #

{ok-script-0.0.74 → ok-script-0.0.76}/ok/gui/App.py

@@ -61,8 +61,10 @@ class App:
             logger.debug(f"translator install success {QCoreApplication.translate('MainWindow', 'Debug')}")
         else:
             logger.debug(f"No translation available for {self.locale}, falling back to English/default. {full_path}")
-
-        self.updater = Updater(self.config, exit_event)
+        if self.config.get('update'):
+            self.updater = Updater(self.config, exit_event)
+        else:
+            self.updater = None
         self.start_controller = StartController(self.config, exit_event)
 
     def center_window(self, window):

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

@@ -68,8 +68,7 @@ class MainWindow(MSFluentWindow):
         communicate.executor_paused.connect(self.executor_paused)
         communicate.tab.connect(self.navigate_tab)
 
-        self.shortcut = QShortcut(QKeySequence("Ctrl+Alt+D"), self)
-        self.shortcut.activated.connect(dump_threads)
+      
 
         # Create a context menu for the tray
         menu = QMenu()

{ok-script-0.0.74 → ok-script-0.0.76}/ok/gui/StartController.py

@@ -45,7 +45,7 @@ class StartController(QObject):
                         communicate.starting_emulator.emit(True, self.tr('Start game timeout!'), 0)
                         return
                     communicate.starting_emulator.emit(False, None, int(remaining_time))
-                    time.sleep(1)
+                    time.sleep(2)
             else:
                 communicate.starting_emulator.emit(True,
                                                    self.tr('Game path does not exist, Please open game manually!'), 0)

{ok-script-0.0.74 → ok-script-0.0.76}/ok/gui/about/AboutTab.py

@@ -24,7 +24,7 @@ class AboutTab(Tab):
 
         # Set the layout on the widget
         self.addWidget(about_label)
-        if ok.gui.app.updater.enabled():
+        if ok.gui.app.updater is not None and ok.gui.app.updater.enabled():
             self.download_latest_button = PushButton(self.tr('Download Release'))
             self.download_latest_button.clicked.connect(self.download_latest)
             self.download_latest_debug_button = PushButton(self.tr('Download Debug'))

{ok-script-0.0.74 → ok-script-0.0.76}/ok/gui/about/VersionCard.py

@@ -14,27 +14,29 @@ class VersionCard(SettingCard):
 
     def __init__(self, icon, title, version, debug, parent=None):
         super().__init__(icon, title, f'{version} {self.get_type(debug)}')
-        self.downloading_text = QLabel()
-        self.hBoxLayout.addWidget(self.downloading_text)
-        self.hBoxLayout.addSpacing(16)
-
-        self.download_bar = ProgressBar(self)
-        self.download_bar.setFixedWidth(80)
-        self.download_bar.setFixedHeight(6)
-        self.hBoxLayout.addWidget(self.download_bar)
-        self.hBoxLayout.addSpacing(16)
-
-        self.check_update_button = PushButton(self.tr("Check for updates"))
-        self.check_update_button.clicked.connect(self.check_update)
-        self.hBoxLayout.addWidget(self.check_update_button)
-        self.hBoxLayout.addSpacing(16)
-        self.update_button = PushButton()
-        self.update_button.clicked.connect(self.show_update_dialog)
-        self.hBoxLayout.addWidget(self.update_button)
-        self.hBoxLayout.addSpacing(16)
-        self.update_buttons(0, "")
-        communicate.check_update.connect(self.update_update)
-        communicate.download_update.connect(self.download_update)
+
+        if ok.gui.app.updater is not None:
+            self.downloading_text = QLabel()
+            self.hBoxLayout.addWidget(self.downloading_text)
+            self.hBoxLayout.addSpacing(16)
+
+            self.download_bar = ProgressBar(self)
+            self.download_bar.setFixedWidth(80)
+            self.download_bar.setFixedHeight(6)
+            self.hBoxLayout.addWidget(self.download_bar)
+            self.hBoxLayout.addSpacing(16)
+
+            self.check_update_button = PushButton(self.tr("Check for updates"))
+            self.check_update_button.clicked.connect(self.check_update)
+            self.hBoxLayout.addWidget(self.check_update_button)
+            self.hBoxLayout.addSpacing(16)
+            self.update_button = PushButton()
+            self.update_button.clicked.connect(self.show_update_dialog)
+            self.hBoxLayout.addWidget(self.update_button)
+            self.hBoxLayout.addSpacing(16)
+            self.update_buttons(0, "")
+            communicate.check_update.connect(self.update_update)
+            communicate.download_update.connect(self.download_update)
 
     def download_update(self, percent, progress, done, error):
         if done and not error:

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

@@ -1,7 +1,10 @@
 import subprocess
+from ctypes import windll, wintypes
 
-from PySide6.QtCore import Qt, Signal
-from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout
+from PySide6.QtCore import Qt, Signal, QEvent
+from PySide6.QtGui import QShortcut, QKeySequence
+from PySide6.QtWidgets import QWidget, QFileDialog, QCompleter, QVBoxLayout, QHBoxLayout, QMessageBox
+from _ctypes import byref
 from qfluentwidgets import PushButton, FlowLayout, ComboBox, SearchLineEdit, TextEdit
 
 import ok.gui
@@ -40,11 +43,16 @@ class DebugTab(Tab):
         dump_button = PushButton(self.tr("Dump Threads(HotKey:Ctrl+Alt+D)"))
         dump_button.clicked.connect(lambda: self.handler.post(dump_threads))
         layout.addWidget(dump_button)
+        # self.dump_shortcut = QShortcut(QKeySequence("Ctrl+Alt+D"), self)
+        # self.dump_shortcut.activated.connect(dump_threads)
 
         capture_button = PushButton(self.tr("Capture Screenshot"))
         capture_button.clicked.connect(lambda: self.handler.post(self.capture))
         layout.addWidget(capture_button)
 
+        # self.shortcut = QShortcut(QKeySequence("Ctrl+Alt+S"), self)
+        # self.shortcut.activated.connect(lambda: self.handler.post(self.capture))
+
         ocr_button = PushButton("OCR")
         ocr_button.clicked.connect(lambda: self.handler.post(self.ocr))
         layout.addWidget(ocr_button)
@@ -90,6 +98,41 @@ class DebugTab(Tab):
         self.result_edit = TextEdit()
         call_task_container.addWidget(self.result_edit, stretch=1)
         self.update_result_text.connect(self.result_edit.setText)
+        self.handler.post(self.bind_hot_keys)
+        self.handler.post(self.check_hotkey, 0.1)
+
+    def check_hotkey(self):
+        # Example event type, you should use the appropriate QEvent.Type for your case
+        msg = wintypes.MSG()
+
+        # PeekMessageW is used to check for a hotkey press
+        if windll.user32.PeekMessageW(byref(msg), None, 0, 0, 1):
+            if msg.message == 0x0312:  # WM_HOTKEY
+                logger.debug(f'hotkey pressed {msg}')
+                if msg.wParam == 1:
+                    dump_threads()
+                elif msg.wParam == 2:
+                    self.handler.post(self.capture)
+
+        # Repost the check_hotkey method to be called after 100 ms
+        self.handler.post(self.check_hotkey, 0.1)
+
+    def bind_hot_keys(self):
+        MOD_ALT = 0x0001
+        MOD_CONTROL = 0x0002
+        VK_D = 0x44  # Virtual-Key code for 'D'
+        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")
+        if not windll.user32.RegisterHotKey(None, 2, MOD_ALT | MOD_CONTROL, VK_S):
+            print("Failed to register hotkey for Alt+Ctrl+S")
+        logger.debug('bind_hot_keys')
+
+    def __del__(self):
+        # Unregister the hotkeys
+        windll.user32.UnregisterHotKey(None, 1)
+        windll.user32.UnregisterHotKey(None, 2)
 
     def call(self):
         func_name = self.target_function_edit.text()

{ok-script-0.0.74 → ok-script-0.0.76}/ok/interaction/ADBInteraction.py

@@ -23,8 +23,8 @@ class ADBBaseInteraction(BaseInteraction):
     def swipe(self, from_x, from_y, to_x, to_y, duration):
         self.device_manager.device.shell(f"input swipe {from_x} {from_y} {to_x} {to_y} {duration}")
 
-    def click(self, x=-1, y=-1, move_back=False):
-        super().click(x, y)
+    def click(self, x=-1, y=-1, move_back=False, name=None):
+        super().click(x, y, name=name)
         x = int(x * self.width / self.capture.width)
         y = int(y * self.height / self.capture.height)
         self.device_manager.shell(f"input tap {x} {y}")

{ok-script-0.0.74 → ok-script-0.0.76}/ok/interaction/BaseInteraction.py

@@ -23,5 +23,8 @@ class BaseInteraction:
     def move_relative(self, x, y):
         self.move(int(self.capture.width * x), int(self.capture.height * y))
 
-    def click(self, x=-1, y=-1):
-        logger.info(f"click {x, y}")
+    def click(self, x=-1, y=-1, name=None):
+        if name is None:
+            logger.info(f"click {x, y}")
+        else:
+            logger.info(f"click {name} {x, y}")

{ok-script-0.0.74 → ok-script-0.0.76}/ok/interaction/Win32Interaction.py

@@ -64,8 +64,8 @@ class Win32Interaction(BaseInteraction):
         # Release the left mouse button
         pydirectinput.mouseUp()
 
-    def click(self, x=-1, y=-1, move_back=False):
-        super().click(x, y)
+    def click(self, x=-1, y=-1, move_back=False, name=None):
+        super().click(x, y, name=name)
         if not self.capture.clickable():
             logger.info(f"window in background, not clickable")
             return

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

@@ -57,6 +57,10 @@ class OCR:
                     pos = res[0]
                     text = res[1]
                     confidence = res[2]
+                    width, height = int(pos[2][0] - pos[0][0]), int(pos[2][1] - pos[0][1])
+                    if width <= 0 or height <= 0:
+                        logger.error(f'ocr result negative box {text} {confidence} {width}x{height} pos:{pos}')
+                        continue
                     if confidence >= threshold:
                         detected_box = Box(int(pos[0][0]), int(pos[0][1]), int(pos[2][0] - pos[0][0]),
                                            int(pos[2][1] - pos[0][1]),

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

@@ -33,11 +33,11 @@ class ExecutorOperation:
     def is_scene(self, the_scene):
         return isinstance(self.executor.current_scene, the_scene)
 
-    def click(self, x, y, move_back=False):
+    def click(self, x, y, move_back=False, name=None):
         frame = self.executor.nullable_frame()
         communicate.emit_draw_box("click", [Box(max(0, x - 10), max(0, y - 10), 20, 20, name="click")], "green", frame)
         self.executor.reset_scene()
-        self.executor.interaction.click(x, y, move_back)
+        self.executor.interaction.click(x, y, move_back, name=name)
 
     def swipe_relative(self, from_x, from_y, to_x, to_y, duration=0.5):
         self.swipe(int(self.width * from_x), int(self.height * from_y), int(self.width * to_x),
@@ -103,7 +103,7 @@ class ExecutorOperation:
         return int(percent * self.executor.method.width)
 
     def click_relative(self, x, y, move_back=False):
-        self.click(int(self.width * x), int(self.height * y), move_back)
+        self.click(int(self.width * x), int(self.height * y), move_back, name=f'relative({x:.2f}, {y:.2f})')
 
     @property
     def height(self):
@@ -117,18 +117,18 @@ class ExecutorOperation:
         self.executor.interaction.move_relative(x, y)
 
     def click_box(self, box: Box | List[Box] = None, relative_x=0.5, relative_y=0.5, raise_if_not_found=True):
-        if box is None:
-            self.logger.error(f"click_box box is None")
-            if raise_if_not_found:
-                raise Exception(f"click_box box is None")
-            return
         if isinstance(box, list):
             if len(box) > 0:
                 box = box[0]
             else:
                 self.logger.error(f"No box")
+        if box is None:
+            self.logger.error(f"click_box box is None")
+            if raise_if_not_found:
+                raise Exception(f"click_box box is None")
+            return
         x, y = box.relative_with_variance(relative_x, relative_y)
-        self.click(x, y)
+        self.click(x, y, name=box.name)
 
     def wait_scene(self, scene_type=None, time_out=0, pre_action=None, post_action=None):
         return self.executor.wait_scene(scene_type, time_out, pre_action, post_action)

{ok-script-0.0.74 → ok-script-0.0.76}/ok/task/TaskExecutor.py

@@ -277,6 +277,8 @@ class TaskExecutor:
                 traceback.print_exc()
                 stack_trace_str = traceback.format_exc()
                 logger.error(f"{name} exception: {e}, traceback: {stack_trace_str}")
+                if self._frame:
+                    communicate.screenshot.emit(self.frame, name)
             self.current_task = None
             if isinstance(self.current_task, OneTimeTask):
                 self.current_task.running = False

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

@@ -44,8 +44,8 @@ class GithubMultiDownloader:
             elif len(self.proxys) > 0:
                 proxy = self.proxys.pop(0)  # Remove the first item
                 self.proxys.append(proxy)  # Add the removed item to the end
-            prefix = '/' if proxy else ''
-            url = proxy + prefix + url if proxy is not None else None
+            prefix = '' if proxy == "" else '/'
+            url = (proxy + prefix + url) if proxy is not None else None
             return url, proxy
 
     def download_part(self, part_size, start, end, file, giturl, last_proxy=None):
@@ -74,7 +74,7 @@ class GithubMultiDownloader:
 
         headers = {'Range': f'bytes={part_start}-{end}'}
         url, proxy = self.next_url(giturl)
-        if url is None:
+        if proxy is None:
             logger.error(f'all proxies failed to download {file}')
             return
         logger.debug(f'start multi part downloading {part_size} {target_size} {target_size <= part_size} {file} {url}')

{ok-script-0.0.74 → ok-script-0.0.76}/ok/update/Updater.py

@@ -350,11 +350,14 @@ class Updater:
 
 
 def is_newer_or_eq_version(base_version, target_version):
-    base_version = list(map(int, base_version[1:].split('.')))
-    target_version = list(map(int, target_version[1:].split('.')))
-
-    # Compare the versions
-    return base_version <= target_version
+    try:
+        base_version = list(map(int, base_version[1:].split('.')))
+        target_version = list(map(int, target_version[1:].split('.')))
+        # Compare the versions
+        return base_version <= target_version
+    except Exception as e:
+        logger.error(f'is_newer_or_eq_version error {base_version} {target_version}', e)
+        return False
 
 
 def convert_size(size_bytes):

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

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

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

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