ok-script 0.0.8__tar.gz → 0.0.9__tar.gz

{ok-script-0.0.8 → ok-script-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.8
+Version: 0.0.9
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -18,7 +18,7 @@ Requires-Dist: pywin32==306
 Requires-Dist: typing-extensions~=4.10.0
 Requires-Dist: PySide6~=6.6.2
 
-# autoui
+# ok-script
 
 This project aims to provide a universal framework for developing automation tool for PC/Android games, running in
 windows,

{ok-script-0.0.8 → ok-script-0.0.9}/README.md

@@ -1,4 +1,4 @@
-# autoui
+# ok-script
 
 This project aims to provide a universal framework for developing automation tool for PC/Android games, running in
 windows,

{ok-script-0.0.8 → ok-script-0.0.9}/ok/OK.py

@@ -36,18 +36,22 @@ class OK:
         self.init_device_manager()
         if config.get("use_gui"):
             self.app = App(self.config.get('gui_icon'), self.debug, self.config.get('gui_title'),
-                           self.config['tasks'], self.exit_event)
+                           self.config['tasks'], self.config.get('about'), self.exit_event)
             ok.gui.app = self.app
+        else:
+            self.device_manager.set_preferred_device()
+            self.device_manager.start()
+            self.do_init()
+
+    def start(self):
+        if self.config.get("use_gui"):
             self.app.show_loading()
             self.worker = InitWorker(self.do_init)
             self.worker.start()
             self.app.exec()
         else:
-            self.device_manager.set_preferred_device()
-            self.device_manager.start()
-            self.do_init()
             self.task_executor.start()
-            if config.get("debug"):
+            if self.config.get("debug"):
                 self.app = QApplication(sys.argv)
                 self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
                 self.app.exec()

{ok-script-0.0.8 → ok-script-0.0.9}/ok/capture/adb/DeviceManager.py

@@ -102,7 +102,6 @@ class DeviceManager:
             self.device_dict[self.hwnd_title] = {"address": "", "imei": self.hwnd_title, "method": "windows",
                                                  "model": "", "nick": nick or self.hwnd_title,
                                                  "connected": self.hwnd is not None and self.hwnd.exists,
-                                                 "preferred": False,
                                                  "resolution": f"{width}x{height}"}
         communicate.adb_devices.emit()
         self.config.save_file()
@@ -110,20 +109,13 @@ class DeviceManager:
 
     def set_preferred_device(self, imei=None):
         logger.debug(f"set_preferred_device {imei}")
-        preferred = None
         if imei is None:
-            for device in self.device_dict.values():
-                if device.get('preferred'):
-                    preferred = device
-                    imei = preferred['imei']
-        else:
-            preferred = self.device_dict.get(imei)
-        for key in self.device_dict.keys():
-            if imei == key:
-                self.device_dict[imei]["preferred"] = False
+            imei = self.config.get("preferred")
+        preferred = self.device_dict.get(imei)
         if preferred is None and len(self.device_dict) > 0:
             preferred = next(iter(self.device_dict.values()))
         if preferred is not None:
+            imei = preferred['imei']
             preferred['preferred'] = True
             if preferred['method'] == 'windows':
                 if not isinstance(self.capture_method, WindowsGraphicsCaptureMethod):
@@ -141,6 +133,7 @@ class DeviceManager:
                         self.capture_method.close()
                     self.capture_method = ADBCaptureMethod(self)
                     self.interaction = ADBBaseInteraction(self, self.capture_method)
+        self.config["preferred"] = imei
         self.config.save_file()
         logger.debug(f'preferred device: {preferred}')
 
@@ -148,10 +141,10 @@ class DeviceManager:
         if isinstance(self.capture_method, ADBCaptureMethod):
             if self.debug:
                 if self.hwnd is not None:
-                    self.hwnd.update_title_re("autohelper_debug")
+                    self.hwnd.update_title_re("ok_debug")
                     self.hwnd.update_frame_size(self.capture_method.width, self.capture_method.height)
                 else:
-                    self.hwnd = HwndWindow("autohelper_debug", self.exit_event, self.capture_method.width,
+                    self.hwnd = HwndWindow("ok_debug", self.exit_event, self.capture_method.width,
                                            self.capture_method.height)
             else:
                 self.hwnd.stop()
@@ -159,8 +152,6 @@ class DeviceManager:
 
     @property
     def device(self):
-        if self._device is None:
-            self.set_preferred_device()
         return self._device
 
     @property

{ok-script-0.0.8 → ok-script-0.0.9}/ok/feature/Box.py

@@ -24,6 +24,14 @@ class Box:
                 self.confidence == other.confidence and
                 self.name == other.name)
 
+    def in_boundary(self, boxes):
+        in_boundary_boxes = []
+        for box in boxes:
+            if (self.x <= box.x and self.x + self.width >= box.x + box.width and
+                    self.y <= box.y and self.y + self.height >= box.y + box.height):
+                in_boundary_boxes.append(box)
+        return in_boundary_boxes
+
     def __repr__(self):
         return self.name
 
@@ -80,7 +88,7 @@ class Box:
     def center(self):
         return self.x + self.width / 2, self.y + self.height / 2
 
-    def find_closest_box(self, direction: str, boxes: list):
+    def find_closest_box(self, direction: str, boxes: list, condition=None):
         orig_center_x, orig_center_y = self.center()
 
         def distance_criteria(box):
@@ -91,14 +99,21 @@ class Box:
             dy = box_center_y - orig_center_y
             distance = math.sqrt(dx ** 2 + dy ** 2)
             if box == self:
-                return float('inf')
+                distance = float('inf')
             elif direction == 'up' and self.y - (box.y + box.height / 2) >= 0:
-                return distance
+                pass
             elif direction == 'down' and box.y - (self.y + self.height / 2) >= 0:
-                return distance
+                pass
             elif direction == 'left' and self.x - (box.x + box.width / 2) >= 0:
-                return distance
+                pass
             elif direction == 'right' and box.x - (self.x + self.width / 2) >= 0:
+                pass
+            else:
+                distance = float('inf')
+            return check_condition(box, distance)
+
+        def check_condition(box, distance):
+            if condition is None or condition(box):
                 return distance
             else:
                 return float('inf')

{ok-script-0.0.8 → ok-script-0.0.9}/ok/gui/App.py

@@ -18,12 +18,13 @@ logger = get_logger(__name__)
 
 
 class App:
-    def __init__(self, icon=None, overlay=False, title="AutoUI", tasks=None,
+    def __init__(self, icon=None, overlay=False, title="AutoUI", tasks=None, about=None,
                  exit_event=None):
         super().__init__()
         self.app = QApplication(sys.argv)
         self.app.setStyle(QStyleFactory.create("Fusion"))
         self.tasks = tasks
+        self.about = about
         self.title = title
         self.overlay = overlay
         self.loading_window = None
@@ -86,7 +87,7 @@ class App:
 
     def show_main_window(self):
         self.loading_window.close()
-        self.main_window = MainWindow(self.tasks, self.overlay, exit_event=self.exit_event)
+        self.main_window = MainWindow(self.tasks, self.overlay, self.about, exit_event=self.exit_event)
         self.main_window.setWindowTitle(self.title)  # Set the window title here
         self.main_window.setWindowIcon(self.icon)
         if self.overlay and ok.gui.device_manager.hwnd is not None:

{ok-script-0.0.8 → ok-script-0.0.9}/ok/gui/MainWindow.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import QObject, Signal, Slot
 from PySide6.QtWidgets import QMessageBox, QTabWidget
 
+from ok.gui.about.AboutTab import AboutTab
 from ok.gui.debug.DebugTab import DebugTab
 from ok.gui.tasks.TaskTab import TaskTab
 from ok.logging.Logger import get_logger
@@ -13,7 +14,7 @@ class Communicate(QObject):
 
 
 class MainWindow(QTabWidget):
-    def __init__(self, tasks, debug=False, exit_event=None):
+    def __init__(self, tasks, debug=False, about=None, exit_event=None):
         super().__init__()
         self.exit_event = exit_event
         task_tab = TaskTab(tasks)
@@ -22,6 +23,9 @@ class MainWindow(QTabWidget):
             debug_tab = DebugTab()
             self.addTab(debug_tab, self.tr("Debug"))
         # ... Add other tabs similarly
+        if about:
+            about_tab = AboutTab(about)
+            self.addTab(about_tab, self.tr("About"))
 
         # Styling the tabs and content if needed, for example:
         self.setStyleSheet("""

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

@@ -0,0 +1,16 @@
+from PySide6.QtWidgets import QWidget, QTextEdit, QVBoxLayout
+
+
+class AboutTab(QWidget):
+    def __init__(self, text=""):
+        super().__init__()
+        layout = QVBoxLayout()
+
+        # Create a QTextEdit instance
+        text_edit = QTextEdit()
+        text_edit.setHtml(text)
+        text_edit.setReadOnly(True)
+        layout.addWidget(text_edit)
+
+        # Set the layout on the widget
+        self.setLayout(layout)

{ok-script-0.0.8 → ok-script-0.0.9}/ok/gui/loading/LoadingWindow.py

@@ -80,7 +80,7 @@ class LoadingWindow(QWidget):
         self.capture_list_data.clear()
         if len(devices) > 0:
             for row, device in enumerate(devices):
-                if device["preferred"]:
+                if device["imei"] == ok.gui.device_manager.config.get("preferred"):
                     selected = row
                 method = self.tr("PC") if device['method'] == "windows" else self.tr("Android")
                 connected = self.tr("Connected") if device['connected'] else self.tr("Disconnected")

{ok-script-0.0.8 → ok-script-0.0.9}/ok/task/BaseTask.py

@@ -15,8 +15,6 @@ class BaseTask(ExecutorOperation):
     def __init__(self):
         self.logger = get_logger(self.__class__.__name__)
         self.name = self.__class__.__name__
-        self.success_count = 0
-        self.error_count = 0
         self.enabled = True
         self.running = False
         self.config = None
@@ -31,6 +29,11 @@ class BaseTask(ExecutorOperation):
             self.notification(message)
         communicate.task_info.emit()
 
+    def log_debug(self, message, notify=False):
+        self.logger.debug(message)
+        if notify:
+            self.notification(message)
+
     def log_error(self, message, exception=None, notify=False):
         self.logger.error(message, exception)
         if exception is not None:

{ok-script-0.0.8 → ok-script-0.0.9}/ok/task/ExecutorOperation.py

@@ -1,8 +1,5 @@
 from ok.feature.Box import Box, find_box_by_name
 from ok.gui.Communicate import communicate
-from ok.logging.Logger import get_logger
-
-logger = get_logger(__name__)
 
 
 class ExecutorOperation:
@@ -17,6 +14,9 @@ class ExecutorOperation:
         else:
             return False
 
+    def pause(self):
+        self.executor.pause()
+
     def is_scene(self, the_scene):
         return isinstance(self.executor.current_scene, the_scene)
 
@@ -46,7 +46,7 @@ class ExecutorOperation:
         """
         to_click = find_box_by_name(boxes, names)
         if to_click is not None:
-            logger.info(f"click_box_if_name_match found {to_click}")
+            self.logger.info(f"click_box_if_name_match found {to_click}")
             self.click_box(to_click, relative_x, relative_y)
             return to_click
 
@@ -79,9 +79,9 @@ class ExecutorOperation:
             if len(box) > 0:
                 box = box[0]
             else:
-                logger.error(f"No box")
+                self.logger.error(f"No box")
         if box is None:
-            logger.error(f"click_box 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

{ok-script-0.0.8 → ok-script-0.0.9}/ok/task/TaskExecutor.py

@@ -170,12 +170,7 @@ class TaskExecutor:
                     task.running = True
                     task.last_execute_time = start
                     try:
-                        result = task.run_frame()
-                        if result is not None:
-                            if result:
-                                task.success_count += 1
-                            else:
-                                task.error_count += 1
+                        task.run_frame()
                     except TaskDisabledException:
                         logger.info(f"{task.name} is disabled, breaking")
                     except Exception as e:

{ok-script-0.0.8 → ok-script-0.0.9}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.8
+Version: 0.0.9
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -18,7 +18,7 @@ Requires-Dist: pywin32==306
 Requires-Dist: typing-extensions~=4.10.0
 Requires-Dist: PySide6~=6.6.2
 
-# autoui
+# ok-script
 
 This project aims to provide a universal framework for developing automation tool for PC/Android games, running in
 windows,

{ok-script-0.0.8 → ok-script-0.0.9}/ok_script.egg-info/SOURCES.txt

@@ -32,6 +32,8 @@ ok/gui/MainWindow.py
 ok/gui/TabTitles.py
 ok/gui/__init__.py
 ok/gui/resources.py
+ok/gui/about/AboutTab.py
+ok/gui/about/__init__.py
 ok/gui/debug/AspectRatioWidget.py
 ok/gui/debug/DebugTab.py
 ok/gui/debug/FrameWidget.py

{ok-script-0.0.8 → ok-script-0.0.9}/setup.py

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