ok-script 0.0.49__tar.gz → 0.0.52__tar.gz

{ok-script-0.0.49 → ok-script-0.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.49
+Version: 0.0.52
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -21,6 +21,7 @@ Requires-Dist: PySide6-Fluent-Widgets>=1.5.6
 Requires-Dist: psutil>=5.9.8
 Requires-Dist: opencv-python>=4.9.0.80
 Requires-Dist: ok-d3dshot>=0.1.5
+Requires-Dist: py7zr>=0.21.0
 
 # ok-script
 

{ok-script-0.0.49 → ok-script-0.0.52}/ok/capture/BaseCaptureMethod.py

@@ -1,5 +1,9 @@
 import numpy as np
 
+from ok.logging.Logger import get_logger
+
+logger = get_logger(__name__)
+
 
 class CaptureException(Exception):
     pass
@@ -21,13 +25,19 @@ class BaseCaptureMethod:
     @property
     def width(self):
         if self._size[0] == 0:
-            self.get_frame()
+            try:
+                self.get_frame()
+            except Exception as e:
+                logger.error('get frame error')
         return self._size[0]
 
     @property
     def height(self):
         if self._size[1] == 0:
-            self.get_frame()
+            try:
+                self.get_frame()
+            except Exception as e:
+                logger.error('get frame error')
         return self._size[1]
 
     def get_frame(self) -> np.ndarray | None:
@@ -35,8 +45,8 @@ class BaseCaptureMethod:
             frame = self.do_get_frame()
             if frame is not None:
                 self._size = (frame.shape[1], frame.shape[0])
-            if frame.shape[2] == 4:
-                frame = frame[:, :, :3]
+                if frame.shape[2] == 4:
+                    frame = frame[:, :, :3]
             return frame
         except Exception as e:
             raise CaptureException() from e

{ok-script-0.0.49 → ok-script-0.0.52}/ok/capture/adb/DeviceManager.py

@@ -1,12 +1,10 @@
 import threading
 
 import win32gui
-from adbutils import AdbError
 
 from ok.capture.HwndWindow import HwndWindow, find_hwnd_by_title_and_exe
 from ok.capture.adb.ADBCaptureMethod import ADBCaptureMethod, do_screencap
 from ok.capture.adb.WindowsCaptureFactory import update_capture_method
-from ok.capture.adb.vbox import installed_emulator
 from ok.capture.windows.window import get_window_bounds
 from ok.config.Config import Config
 from ok.gui.Communicate import communicate
@@ -36,8 +34,7 @@ class DeviceManager:
                              "DeviceManager")
         self.thread = None
         self.capture_method = None
-        self.update_pc_device()
-        self.start()
+        self.refresh()
 
     def refresh(self):
         if self.thread is None or not self.thread.is_alive():
@@ -121,6 +118,7 @@ class DeviceManager:
             return
         if not fast:
             self.connect_all()
+        from ok.capture.adb.vbox import installed_emulator
         installed_emulators = [] if fast else installed_emulator()
         for device in self.adb.list():
             logger.debug(f'adb.list() {device}')
@@ -295,6 +293,7 @@ class DeviceManager:
     def shell(self, *args, **kwargs):
         device = self.device
         if device is not None:
+            from adbutils import AdbError
             try:
                 return device.shell(*args, **kwargs)
             except AdbError as e:

{ok-script-0.0.49 → ok-script-0.0.52}/ok/color/Color.py

@@ -17,8 +17,9 @@ def calculate_color_percentage(image, color_ranges, box=None):
     # Check if the ROI is within the image bounds
     if box is not None:
         if (box.x >= 0 and box.y >= 0 and
-                box.x + box.width <= image.shape[1] and  # image.shape[1] is the width of the image
-                box.y + box.height <= image.shape[0]):  # image.shape[0] is the height of the image
+            box.x + box.width <= image.shape[1] and  # image.shape[1] is the width of the image
+            box.y + box.height <= image.shape[
+                0]) and box.width > 0 and box.height > 0:  # image.shape[0] is the height of the image
 
             # Extract the region of interest (ROI) using slicing
 

{ok-script-0.0.49 → ok-script-0.0.52}/ok/gui/App.py

@@ -8,11 +8,13 @@ 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.MessageWindow import MessageWindow
 from ok.gui.i18n.path import i18n_path
 from ok.gui.overlay.OverlayWindow import OverlayWindow
 from ok.logging.Logger import get_logger
+from ok.update.Updater import Updater
 
 logger = get_logger(__name__)
 
@@ -29,6 +31,7 @@ class App:
         QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
 
         self.app = QApplication(sys.argv)
+        communicate.quit.connect(self.app.quit)
         self.app.setAttribute(Qt.AA_DontCreateNativeWidgetSiblings)
         qconfig.theme = Theme.AUTO
 
@@ -55,6 +58,8 @@ class App:
         else:
             logger.debug(f"No translation available for {self.locale}, falling back to English/default. {full_path}")
 
+        self.updater = Updater(self.config, exit_event)
+
     def center_window(self, window):
         screen = self.app.primaryScreen()
         size = screen.size()
@@ -75,8 +80,9 @@ class App:
         self.show_message_window(title, content)
 
     def show_main_window(self):
-        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 = MainWindow(self.icon, self.title, self.version, self.overlay, self.about,
+                                      exit_event=self.exit_event)
+        # Set the window title here
         self.main_window.setWindowIcon(self.icon)
         if self.overlay and ok.gui.device_manager.hwnd is not None:
             self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
@@ -104,5 +110,6 @@ class App:
     def exec(self):
         sys.exit(self.app.exec())
 
-    def quit(self):
-        self.app.quit()
+    @staticmethod
+    def quit():
+        communicate.quit.emit()

{ok-script-0.0.49 → ok-script-0.0.52}/ok/gui/Communicate.py

@@ -20,6 +20,9 @@ class Communicate(QObject):
     config_validation: Signal = Signal(str)
     tab = Signal(str)
     capture_error = Signal()
+    check_update = Signal(str)
+    download_update = Signal(float, str, bool, str)
+    quit = 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.49 → ok-script-0.0.52}/ok/gui/MainWindow.py

@@ -20,7 +20,7 @@ class Communicate(QObject):
 
 
 class MainWindow(MSFluentWindow):
-    def __init__(self, icon, debug=False, about=None, exit_event=None):
+    def __init__(self, icon, title, version, debug=False, about=None, exit_event=None):
         super().__init__()
         self.exit_event = exit_event
         self.start_tab = StartTab()
@@ -42,11 +42,11 @@ class MainWindow(MSFluentWindow):
         #     self.addSubInterface(debug_tab, FluentIcon.COMMAND_PROMPT, self.tr('Debug'))
         # ... Add other tabs similarly
         if about:
-            about_tab = AboutTab(about)
+            about_tab = AboutTab(icon, title, version, about)
             self.addSubInterface(about_tab, FluentIcon.QUESTION, self.tr('About'),
                                  position=NavigationItemPosition.BOTTOM)
         # Styling the tabs and content if needed, for example:
-        self.setWindowTitle("Close Event Example")
+        self.setWindowTitle(f'{title} {version}')
 
         communicate.executor_paused.connect(self.executor_paused)
         communicate.tab.connect(self.navigate_tab)

ok-script-0.0.52/ok/gui/about/AboutTab.py

@@ -0,0 +1,157 @@
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QHBoxLayout, QLabel
+from qfluentwidgets import PushButton, InfoBar, InfoBarPosition, MessageBox
+
+import ok.gui
+from ok.capture.windows.dump import dump_threads
+from ok.gui.Communicate import communicate
+from ok.gui.about.VersionCard import VersionCard
+from ok.gui.widget.Tab import Tab
+from ok.logging.Logger import get_logger
+
+logger = get_logger(__name__)
+
+
+class AboutTab(Tab):
+    def __init__(self, icon, title, version, about):
+        super().__init__()
+        self.version_card = VersionCard(icon, title, version, self)
+        # Create a QTextEdit instance
+        self.addWidget(self.version_card)
+        if ok.gui.app.updater.enabled():
+            self.download_latest_button = PushButton(self.tr('Download'))
+            self.download_latest_button.clicked.connect(self.download_latest)
+
+            self.latest_hbox = QHBoxLayout()
+            self.addLayout(self.latest_hbox)
+            self.latest_label = QLabel()
+            self.latest_label.setWordWrap(True)
+            self.latest_hbox.addWidget(self.latest_label, stretch=1)
+            self.latest_hbox.addWidget(self.download_latest_button, stretch=0)
+
+            self.download_stable_button = PushButton(self.tr('Download'))
+            self.download_stable_button.resize(self.download_stable_button.sizeHint())
+            self.download_stable_button.clicked.connect(self.download_stable)
+            self.stable_hbox = QHBoxLayout()
+            self.stable_label = QLabel()
+            self.stable_label.setWordWrap(True)
+            self.addLayout(self.stable_hbox)
+            self.stable_hbox.addWidget(self.stable_label, stretch=1)
+            self.stable_hbox.addWidget(self.download_stable_button, stretch=0)
+
+            communicate.download_update.connect(self.download_update)
+
+            self.update_update_buttons(0)
+        about_label = QLabel()
+        about_label.setText(about)
+        about_label.setWordWrap(True)
+        about_label.setOpenExternalLinks(True)
+
+        # Set the layout on the widget
+        self.addWidget(about_label)
+        if ok.gui.ok.debug:
+            dump_button = PushButton(self.tr("Dump Threads(HotKey:Ctrl+Alt+D)"))
+            dump_button.clicked.connect(dump_threads)
+            self.addWidget(dump_button)
+
+    def update_update_buttons(self, percent, progress=""):
+        if ok.gui.app.updater.latest_release:
+            self.latest_label.setText(self.get_version_text(ok.gui.app.updater.latest_release))
+            self.download_latest_button.show()
+            self.latest_label.show()
+        else:
+            self.latest_label.hide()
+            self.download_latest_button.hide()
+        if ok.gui.app.updater.stable_release:
+            self.stable_label.setText(self.get_version_text(ok.gui.app.updater.stable_release))
+            self.stable_label.show()
+            self.download_stable_button.show()
+        else:
+            self.stable_label.hide()
+            self.download_stable_button.hide()
+
+        if ok.gui.app.updater.downloading:
+            self.download_latest_button.setDisabled(True)
+            self.download_stable_button.setDisabled(True)
+        else:
+            self.download_latest_button.setDisabled(False)
+            self.download_stable_button.setDisabled(False)
+
+        if ok.gui.app.updater.to_update:
+            if ok.gui.app.updater.to_update.get('release') == ok.gui.app.updater.latest_release:
+                self.download_latest_button.setText(self.tr('Update'))
+            else:
+                self.download_stable_button.setText(self.tr('Update'))
+        else:
+            self.download_latest_button.setText(self.tr('Download'))
+            self.download_stable_button.setText(self.tr('Download'))
+
+    def get_version_text(self, release):
+        text = "<h3>{title}: {version} ({size})</h3>"
+        if release.get('prerelease'):
+            title = self.tr('Beta Version')
+        else:
+            title = self.tr('Release Version')
+        text = text.format(title=title, version=release.get('version'), size=release.get('readable_size'))
+        text += "<p>{date}</p>".format(date=release.get('date'))
+        text += "<p>{notes}</p>".format(notes=text_to_html_paragraphs(release.get('notes')))
+        return text
+
+    def do_update(self):
+        ok.gui.app.updater.async_run(lambda: ok.gui.app.updater.update())
+
+    def download_update(self, percent, progress, done, error):
+        message = ""
+        if done:
+            if error:
+                title = self.tr('Download Error:')
+                message = error
+                InfoBar.error(
+                    title=title,
+                    content=message,
+                    orient=Qt.Horizontal,
+                    isClosable=True,
+                    position=InfoBarPosition.TOP,
+                    duration=5000,  # won't disappear automatically
+                    parent=self
+                )
+            else:
+                self.show_update_dialog()
+
+        self.update_update_buttons(percent, progress)
+
+    def show_update_dialog(self):
+        title = self.tr('Update Now')
+        content = self.tr(
+            "Are you sure you want to update to {version}?".format(
+                version=ok.gui.app.updater.to_update.get(
+                    'version'))) + '\n\n' + ok.gui.app.updater.to_update.get(
+            'notes')
+
+        w = MessageBox(title, content, self.window())
+        w.setContentCopyable(True)
+        if w.exec():
+            logger.info("user click update")
+            self.do_update()
+
+    def download_latest(self):
+        if ok.gui.app.updater.to_update and ok.gui.app.updater.to_update.get(
+                'release') == ok.gui.app.updater.latest_release:
+            self.show_update_dialog()
+        else:
+            ok.gui.app.updater.async_run(lambda: ok.gui.app.updater.download(ok.gui.app.updater.latest_release))
+
+    def download_stable(self):
+        if ok.gui.app.updater.to_update and ok.gui.app.updater.to_update.get(
+                'release') == ok.gui.app.updater.stable_release:
+            self.show_update_dialog()
+        else:
+            ok.gui.app.updater.async_run(lambda: ok.gui.app.updater.download(ok.gui.app.updater.stable_release))
+
+
+def text_to_html_paragraphs(text):
+    # Split the text into lines
+    lines = text.split('\n')
+
+    # Wrap each line in a <p> tag and join them
+    return ''.join(f'<p>{line}</p>' for line in lines)

ok-script-0.0.52/ok/gui/about/HttpTextEdit.py

@@ -0,0 +1,22 @@
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QApplication
+from qfluentwidgets import TextEdit
+
+
+class VersionCard(TextEdit):
+    """ Sample card """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.anchor = None
+
+    def mousePressEvent(self, e):
+        self.anchor = self.anchorAt(e.pos())
+        if self.anchor:
+            QApplication.setOverrideCursor(Qt.PointingHandCursor)
+
+    def mouseReleaseEvent(self, e):
+        if self.anchor:
+            QDesktopServices.openUrl(QUrl(self.anchor))
+            QApplication.setOverrideCursor(Qt.ArrowCursor)
+        self.anchor = None

ok-script-0.0.52/ok/gui/about/VersionCard.py

@@ -0,0 +1,72 @@
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QLabel
+from qfluentwidgets import SettingCard, PushButton, ProgressBar, InfoBar, InfoBarPosition
+
+import ok
+from ok.gui.Communicate import communicate
+
+
+class VersionCard(SettingCard):
+    """ Sample card """
+
+    def __init__(self, icon, title, version, parent=None):
+        super().__init__(icon, title, version)
+        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_buttons(0, "")
+        communicate.check_update.connect(self.update_update)
+        communicate.download_update.connect(self.download_update)
+
+    def download_update(self, percent, progress, done, error):
+        self.update_buttons(percent, progress)
+
+    def update_buttons(self, percent, progress):
+        if ok.gui.app.updater.downloading:
+            self.downloading_text.show()
+            self.downloading_text.setText(
+                self.tr('Downloading {progress} {percent}%').format(progress=progress, percent=format(percent, '.1f')))
+            self.download_bar.show()
+            self.download_bar.setValue(percent)
+        else:
+            self.downloading_text.hide()
+            self.download_bar.hide()
+
+    def update_update(self, error):
+        title = self.tr('Info')
+        if ok.gui.app.updater.latest_release or ok.gui.app.updater.stable_release:
+            bar = InfoBar.info
+            message = self.tr('Found new version!')
+        elif error:
+            bar = InfoBar.error
+            title = self.tr('Check for update error!')
+            message = error
+        else:
+            bar = InfoBar.info
+            message = self.tr("This is the newest version!")
+        bar(
+            title=title,
+            content=message,
+            orient=Qt.Horizontal,
+            isClosable=True,
+            position=InfoBarPosition.TOP,
+            duration=5000,  # won't disappear automatically
+            parent=self
+        )
+        self.check_update_button.setEnabled(True)
+
+    def check_update(self):
+        ok.gui.app.updater.async_run(lambda: ok.gui.app.updater.check_for_updates())
+        self.check_update_button.setText(self.tr("Checking for updates"))
+        self.check_update_button.setEnabled(False)