ok-script 0.0.34__tar.gz → 0.0.35__tar.gz

{ok-script-0.0.34 → ok-script-0.0.35}/PKG-INFO

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

{ok-script-0.0.34 → ok-script-0.0.35}/ok/capture/BaseCaptureMethod.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+class CaptureException(Exception):
+    pass
 
 class BaseCaptureMethod:
     name = "None"
@@ -21,6 +23,12 @@ class BaseCaptureMethod:
         pass
 
     def get_frame(self) -> np.ndarray | None:
+        try:
+            return self.do_get_frame()
+        except Exception as e:
+            raise CaptureException() from e
+
+    def do_get_frame(self):
         pass
 
     def draw_rectangle(self):

{ok-script-0.0.34 → ok-script-0.0.35}/ok/capture/adb/ADBCaptureMethod.py

@@ -34,7 +34,7 @@ class ADBCaptureMethod(BaseCaptureMethod):
         return self._size[1]
 
     @override
-    def get_frame(self) -> np.ndarray | None:
+    def do_get_frame(self) -> np.ndarray | None:
         return self.screencap()
 
     def screencap(self):

{ok-script-0.0.34 → ok-script-0.0.35}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -174,7 +174,7 @@ class WindowsGraphicsCaptureMethod(BaseCaptureMethod):
         if self.cputex:
             self.cputex.Release()
 
-    def get_frame(self):
+    def do_get_frame(self):
         if self.start_or_stop():
             frame = self.last_frame
             self.last_frame = None

{ok-script-0.0.34 → ok-script-0.0.35}/ok/gui/App.py

@@ -3,16 +3,14 @@ import sys
 
 from PySide6.QtCore import QSize, QCoreApplication, QLocale, QTranslator, Qt
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QApplication, QMenu, QSystemTrayIcon
+from PySide6.QtWidgets import QApplication
 from qfluentwidgets import FluentTranslator, qconfig, Theme
 
 import ok
 import ok.gui.resources
-from ok.gui.Communicate import communicate
 from ok.gui.MainWindow import MainWindow
 from ok.gui.i18n.path import i18n_path
 from ok.gui.overlay.OverlayWindow import OverlayWindow
-from ok.gui.start.StartTab import StartTab
 from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
@@ -45,7 +43,6 @@ class App:
         self.main_window = None
         self.exit_event = exit_event
         self.icon = QIcon(self.config.get('gui_icon') or ":/icon/icon.ico")
-        self.tray = QSystemTrayIcon(self.icon)
 
         translator = QTranslator(self.app)
         full_path = os.path.join(i18n_path, f"{self.locale.name()}")
@@ -57,30 +54,6 @@ class App:
         else:
             logger.debug(f"No translation available for {self.locale}, falling back to English/default. {full_path}")
 
-        # Create a context menu for the tray
-        menu = QMenu()
-        exit_action = menu.addAction(self.app.tr("Exit"))
-        exit_action.triggered.connect(self.quit)
-
-        # Set the context menu and show the tray icon
-        self.tray.setContextMenu(menu)
-        self.tray.show()
-
-        communicate.notification.connect(self.show_notification)
-
-    def show_notification(self, title, message):
-        if title is None:
-            title = self.title
-        self.tray.showMessage(title, message)
-
-    def show(self):
-        self.loading_window = StartTab(self, self.exit_event)
-        size = self.size_relative_to_screen(width=0.6, height=0.4)
-        self.loading_window.resize(size)
-        self.loading_window.setMinimumSize(size)
-        self.center_window(self.loading_window)
-        self.loading_window.show()
-
     def center_window(self, window):
         screen = self.app.primaryScreen()
         size = screen.size()
@@ -91,7 +64,7 @@ class App:
         window.move(half_screen_width / 2, half_screen_height / 2)
 
     def show_main_window(self):
-        self.main_window = MainWindow(self.overlay, self.about, exit_event=self.exit_event)
+        self.main_window = MainWindow(self.icon, self.overlay, self.about, exit_event=self.exit_event)
         self.main_window.setWindowTitle(f'{self.title} {self.version}')  # Set the window title here
         self.main_window.setWindowIcon(self.icon)
         if self.overlay and ok.gui.device_manager.hwnd is not None:
@@ -119,7 +92,3 @@ class App:
 
     def exec(self):
         sys.exit(self.app.exec())
-
-    def quit(self):
-        ok.gui.ok.quit()
-        self.app.quit()

{ok-script-0.0.34 → ok-script-0.0.35}/ok/gui/Communicate.py

@@ -12,12 +12,13 @@ class Communicate(QObject):
     task_info = Signal()
     window = Signal(bool, int, int, int, int, int, int, float)
     loading_progress = Signal(str)
-    notification = Signal(str, str)
+    notification = Signal(str, str, bool)
     executor_paused: Signal = Signal(bool)
     screenshot = Signal(np.ndarray, str)
     update_overlay = Signal()
     adb_devices: Signal = Signal(bool)
     tab = Signal(str)
+    capture_error = Signal()
 
     def emit_draw_box(self, key: str = None, boxes=None, color=None, frame=None):
         self.draw_box.emit(key, boxes, color, frame)

{ok-script-0.0.34 → ok-script-0.0.35}/ok/gui/MainWindow.py

@@ -1,5 +1,6 @@
 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
@@ -19,7 +20,7 @@ class Communicate(QObject):
 
 
 class MainWindow(MSFluentWindow):
-    def __init__(self, debug=False, about=None, exit_event=None):
+    def __init__(self, icon, debug=False, about=None, exit_event=None):
         super().__init__()
         self.exit_event = exit_event
         self.start_tab = StartTab()
@@ -53,6 +54,41 @@ class MainWindow(MSFluentWindow):
         self.shortcut = QShortcut(QKeySequence("Ctrl+Alt+D"), self)
         self.shortcut.activated.connect(dump_threads)
 
+        # Create a context menu for the tray
+        menu = QMenu()
+        exit_action = menu.addAction(self.tr("Exit"))
+        exit_action.triggered.connect(ok.gui.ok.quit)
+
+        self.tray = QSystemTrayIcon(icon)
+
+        # Set the context menu and show the tray icon
+        self.tray.setContextMenu(menu)
+        self.tray.show()
+
+        communicate.capture_error.connect(self.capture_error)
+        communicate.notification.connect(self.show_notification)
+
+    def show_notification(self, message, title=None, error=None):
+        bar = InfoBar.error if error else InfoBar.info
+        if title is None:
+            title = f"{self.tr('Error') if error else 'Info'}:"
+        bar(
+            title=title,
+            content=message,
+            orient=Qt.Horizontal,
+            isClosable=True,
+            position=InfoBarPosition.TOP,
+            duration=5000,  # won't disappear automatically
+            parent=self.window()
+        )
+        if title is None:
+            title = self.title
+        self.tray.showMessage(title, message)
+
+    def capture_error(self):
+        self.show_notification(self.tr('Please check whether the game window is selected correctly!'),
+                               self.tr('Capture Error'), error=True)
+
     def navigate_tab(self, index):
         if index == "start":
             self.switchTo(self.start_tab)

{ok-script-0.0.34 → ok-script-0.0.35}/ok/gui/tasks/OneTimeTaskTab.py

@@ -35,8 +35,7 @@ class OneTimeTaskTab(Tab):
         communicate.task_info.connect(self.update_info_table)
 
     def task_update(self, task):
-        if task == ok.gui.executor.current_task:
-            self.update_info_table()
+        self.update_info_table()
 
     def update_info_table(self):
         task = ok.gui.executor.current_task

{ok-script-0.0.34 → ok-script-0.0.35}/ok/logging/Logger.py

@@ -1,9 +1,10 @@
 import logging
 import os
+import sys
 import traceback
-import ok
 from logging.handlers import TimedRotatingFileHandler
 
+import ok
 from ok.util.path import get_path_relative_to_exe, ensure_dir_for_file
 
 
@@ -34,6 +35,13 @@ def get_substring_from_last_dot_exclusive(s):
 auto_helper_logger = logging.getLogger("ok")
 
 
+def log_exception_handler(exctype, value, traceback):
+    if auto_helper_logger is not None:
+        auto_helper_logger.error(f"Uncaught exception: {exctype}, traceback: {traceback}")
+        # Call the default excepthook to print the traceback
+        sys.__excepthook__(exctype, value, traceback)
+
+
 def config_logger(config):
     if config.get('debug'):
         auto_helper_logger.setLevel(logging.DEBUG)
@@ -70,6 +78,8 @@ def config_logger(config):
         file_handler.setLevel(logging.ERROR)  # File handler level
         auto_helper_logger.addHandler(file_handler)
 
+    sys.excepthook = log_exception_handler
+
 
 class Logger:
     def __init__(self, name):

{ok-script-0.0.34 → ok-script-0.0.35}/ok/task/BaseTask.py

@@ -64,8 +64,8 @@ class BaseTask(ExecutorOperation):
         communicate.task_info.emit()
 
     @staticmethod
-    def notification(message, title=None):
-        communicate.notification.emit(title, message)
+    def notification(message, title=None, error=False):
+        communicate.notification.emit(message, title, error)
 
     @property
     def enabled(self):

{ok-script-0.0.34 → ok-script-0.0.35}/ok/task/TaskExecutor.py

@@ -2,6 +2,7 @@ import threading
 import time
 import traceback
 
+from ok.capture.BaseCaptureMethod import CaptureException
 from ok.capture.adb.DeviceManager import DeviceManager
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
@@ -227,10 +228,12 @@ class TaskExecutor:
                 logger.info(f"FinishedException, breaking")
                 break
             except Exception as e:
+                if isinstance(e, CaptureException):
+                    communicate.capture_error.emit()
                 name = ""
                 if self.current_task is not None:
-                    self.current_task.disable()
                     name = self.current_task.name
+                    self.current_task.disable()
                 traceback.print_exc()
                 stack_trace_str = traceback.format_exc()
                 logger.error(f"{name} exception: {e}, traceback: {stack_trace_str}")

{ok-script-0.0.34 → ok-script-0.0.35}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.34 → ok-script-0.0.35}/setup.py

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