ok-script 0.0.26__tar.gz → 0.0.28__tar.gz

{ok-script-0.0.26 → ok-script-0.0.28}/PKG-INFO

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

{ok-script-0.0.26 → ok-script-0.0.28}/ok/capture/adb/DeviceManager.py

@@ -209,6 +209,7 @@ class DeviceManager:
                 if self.capture_method is not None:
                     self.capture_method.close()
                 self.capture_method = WindowsGraphicsCaptureMethod(self.hwnd)
+            if not isinstance(self.interaction, Win32Interaction):
                 self.interaction = Win32Interaction(self.capture_method)
             self.capture_method.hwnd_window = self.hwnd
         else:

{ok-script-0.0.26 → ok-script-0.0.28}/ok/feature/FindFeature.py

@@ -10,13 +10,13 @@ class FindFeature:
         self.feature_set = None
         self.executor = None
 
-    def find(self, feature_name, horizontal_variance=0, vertical_variance=0, threshold=0) -> List[Box]:
+    def find_feature(self, feature_name, horizontal_variance=0, vertical_variance=0, threshold=0) -> List[Box]:
         if self.executor.frame is None:
             return list()
         return self.feature_set.find_feature(self.executor.frame, feature_name, horizontal_variance, vertical_variance,
                                              threshold)
 
-    def find_and_set(self, features, horizontal_variance=0, vertical_variance=0, threshold=0):
+    def find_feature_and_set(self, features, horizontal_variance=0, vertical_variance=0, threshold=0):
         ret = True
         if features is None:
             raise Exception("features cannot be None")
@@ -42,7 +42,7 @@ class FindFeature:
         return False
 
     def find_one(self, feature_name, horizontal_variance=0, vertical_variance=0, threshold=0) -> Box:
-        boxes = self.find(feature_name, horizontal_variance, vertical_variance, threshold)
+        boxes = self.find_feature(feature_name, horizontal_variance, vertical_variance, threshold)
         if len(boxes) > 0:
             if len(boxes) > 1:
                 print(f"find_one:found {feature_name} too many {len(boxes)}", file=sys.stderr)

{ok-script-0.0.26 → ok-script-0.0.28}/ok/gui/App.py

@@ -38,6 +38,7 @@ class App:
 
         self.about = self.config.get('about')
         self.title = self.config.get('gui_title')
+        self.version = self.config.get('version')
         self.overlay = self.config.get('debug')
         self.loading_window = None
         self.overlay_window = None
@@ -91,7 +92,7 @@ class App:
 
     def show_main_window(self):
         self.main_window = MainWindow(self.overlay, self.about, exit_event=self.exit_event)
-        self.main_window.setWindowTitle(self.title)  # Set the window title here
+        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:
             self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)

{ok-script-0.0.26 → ok-script-0.0.28}/ok/gui/tasks/ConfigItemFactory.py

@@ -1,11 +1,16 @@
 from ok.gui.tasks.LabelAndDoubleSpinBox import LabelAndDoubleSpinBox
+from ok.gui.tasks.LabelAndDropDown import LabelAndDropDown
 from ok.gui.tasks.LabelAndLineEdit import LabelAndLineEdit
 from ok.gui.tasks.LabelAndSpinBox import LabelAndSpinBox
 from ok.gui.tasks.LabelAndSwitchButton import LabelAndSwitchButton
 from ok.gui.tasks.ModifyListItem import ModifyListItem
 
 
-def config_widget(config, config_desc, key, value):
+def config_widget(config, config_desc, config_type, key, value):
+    the_type = config_type.get(key)
+    if the_type:
+        if the_type['type'] == 'drop_down':
+            return LabelAndDropDown(config, config_desc, the_type['options'], key)
     if isinstance(value, bool):
         return LabelAndSwitchButton(config, config_desc, key)
     elif isinstance(value, list):

ok-script-0.0.28/ok/gui/tasks/LabelAndDropDown.py

@@ -0,0 +1,28 @@
+from qfluentwidgets import ComboBox
+
+from ok.gui.tasks.ConfigLabelAndWidget import ConfigLabelAndWidget
+
+
+class LabelAndDropDown(ConfigLabelAndWidget):
+
+    def __init__(self, config, config_desc, options, key: str):
+        super().__init__(config_desc, key)
+        self.key = key
+        self.config = config
+        self.combo_box = ComboBox()
+        self.combo_box.addItems(options)
+        self.combo_box.setCurrentIndex(find_string_index(options, self.config.get(self.key)))
+        self.combo_box.setMinimumWidth(210)
+        self.combo_box.currentTextChanged.connect(self.text_changed)
+        self.add_widget(self.combo_box)
+
+    def text_changed(self, text):
+        self.config[self.key] = text
+
+
+def find_string_index(my_list, target_string):
+    try:
+        index = my_list.index(target_string)
+        return index
+    except ValueError:
+        return 0

{ok-script-0.0.26 → ok-script-0.0.28}/ok/gui/tasks/TaskCard.py

@@ -61,7 +61,7 @@ class TaskCard(ExpandSettingCard):
             self.task.disable()
 
     def __addConfig(self, key: str, value):
-        widget = config_widget(self.task.config, self.task.config_description, key, value)
+        widget = config_widget(self.task.config, self.task.config_description, self.task.config_type, key, value)
         self.config_widgets.append(widget)
         self.viewLayout.addWidget(widget)
         self._adjustViewSize()

{ok-script-0.0.26 → ok-script-0.0.28}/ok/interaction/Win32Interaction.py

@@ -9,6 +9,8 @@ from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
+pydirectinput.FAILSAFE = False
+
 
 class Win32Interaction(BaseInteraction):
 

{ok-script-0.0.26 → ok-script-0.0.28}/ok/task/BaseTask.py

@@ -20,6 +20,7 @@ class BaseTask(ExecutorOperation):
         self.info = InfoDict()
         self.default_config = {}
         self.config_description = {}
+        self.config_type = {}
         self._paused = False
 
     def pause(self):

{ok-script-0.0.26 → ok-script-0.0.28}/ok/task/ExecutorOperation.py

@@ -85,6 +85,20 @@ class ExecutorOperation:
                    int(width * self.executor.method.width), int(height * self.executor.method.height),
                    name=name)
 
+    def height_of_screen(self, percent):
+        return int(percent * self.executor.method.height)
+
+    @property
+    def screen_width(self):
+        return self.executor.method.width
+
+    @property
+    def screen_height(self):
+        return self.executor.method.height
+
+    def width_of_screen(self, percent):
+        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)
 

{ok-script-0.0.26 → ok-script-0.0.28}/ok/task/TaskExecutor.py

@@ -143,13 +143,13 @@ class TaskExecutor:
         if wait_until_before_delay == 0:
             wait_until_before_delay = self.wait_until_before_delay
         self.reset_scene()
-        self.sleep(wait_until_before_delay)
         start = time.time()
         if time_out == 0:
             time_out = self.wait_scene_timeout
         while not self.exit_event.is_set():
             if pre_action is not None:
                 pre_action()
+            self.sleep(wait_until_before_delay)
             self._frame = self.next_frame()
             if self._frame is not None:
                 result = condition()
@@ -179,7 +179,7 @@ class TaskExecutor:
         cycled = False
         for onetime_task in self.onetime_tasks:
             if onetime_task.enabled:
-                return onetime_task, False
+                return onetime_task, True
         if len(self.trigger_tasks) > 0:
             if self.trigger_task_index >= len(self.trigger_tasks) - 1:
                 self.trigger_task_index = -1

{ok-script-0.0.26 → ok-script-0.0.28}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.26 → ok-script-0.0.28}/ok_script.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ ok/gui/start/__init__.py
 ok/gui/tasks/ConfigItemFactory.py
 ok/gui/tasks/ConfigLabelAndWidget.py
 ok/gui/tasks/LabelAndDoubleSpinBox.py
+ok/gui/tasks/LabelAndDropDown.py
 ok/gui/tasks/LabelAndLineEdit.py
 ok/gui/tasks/LabelAndList.py
 ok/gui/tasks/LabelAndSpinBox.py

{ok-script-0.0.26 → ok-script-0.0.28}/setup.py

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