ok-script 0.0.89__tar.gz → 0.0.91__tar.gz

{ok-script-0.0.89 → ok-script-0.0.91}/PKG-INFO

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

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/BaseCaptureMethod.py

@@ -24,20 +24,10 @@ class BaseCaptureMethod:
 
     @property
     def width(self):
-        if self._size[0] == 0:
-            try:
-                self.get_frame()
-            except Exception as e:
-                logger.error('width get frame error', e)
         return self._size[0]
 
     @property
     def height(self):
-        if self._size[1] == 0:
-            try:
-                self.get_frame()
-            except Exception as e:
-                logger.error('height get frame error', e)
         return self._size[1]
 
     def get_frame(self) -> np.ndarray | None:

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/HwndWindow.py

@@ -178,10 +178,9 @@ def find_hwnd(title, exe_name, frame_width, frame_height, player_id=-1):
 
     win32gui.EnumWindows(callback, None)
     if len(results) > 0:
-        biggest = results[0]
+        biggest = None
         for result in results:
-            from ok.capture.windows.BitBltCaptureMethod import bit_blt_test_hwnd
-            if (biggest is None or (result[2] * result[3]) > biggest[2] * biggest[3]) and bit_blt_test_hwnd(result[0]):
+            if biggest is None or (result[2] * result[3]) > biggest[2] * biggest[3]:
                 biggest = result
         x_offset = 0
         y_offset = 0

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/adb/DeviceManager.py

@@ -268,7 +268,7 @@ class DeviceManager:
             width, height = self.get_resolution()
             if self.config.get('capture') == "windows":
                 self.ensure_hwnd(None, preferred.get('full_path'), width, height, preferred['player_id'])
-                self.use_windows_capture({'can_bit_blt': True}, require_bg=True, use_bit_blt_only=True)
+                self.use_windows_capture({'can_bit_blt': True}, require_bg=True, use_bit_blt_only=False)
             else:
                 if not isinstance(self.capture_method, ADBCaptureMethod):
                     logger.debug(f'use adb capture')

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/adb/WindowsCaptureFactory.py

@@ -11,10 +11,10 @@ def update_capture_method(config, capture_method, hwnd, require_bg=False, use_bi
             from ok.capture.windows.BitBltCaptureMethod import BitBltCaptureMethod
             target_method = BitBltCaptureMethod
             capture_method = get_capture(capture_method, target_method, hwnd)
-            if capture_method.test_exclusive_full_screen():
+            if capture_method.test_is_not_pure_color():
                 return capture_method
             else:
-                logger.info("test_exclusive_full_screen failed, can't use BitBlt")
+                logger.info("test_is_not_pure_color failed, can't use BitBlt")
         if use_bit_blt_only:
             return None
         from ok.capture.windows.WindowsGraphicsCaptureMethod import windows_graphics_available

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/windows/BitBltCaptureMethod.py

@@ -10,7 +10,7 @@ from typing_extensions import override
 
 from ok.capture.windows.BaseWindowsCaptureMethod import BaseWindowsCaptureMethod
 from ok.capture.windows.utils import try_delete_dc, BGRA_CHANNEL_COUNT
-from ok.capture.windows.window import get_window_bounds
+from ok.color.Color import is_close_to_pure_color
 from ok.logging.Logger import get_logger
 
 # This is an undocumented nFlag value for PrintWindow
@@ -60,12 +60,17 @@ class BitBltCaptureMethod(BaseWindowsCaptureMethod):
             return False
         return True
 
-
-def bit_blt_test_hwnd(hwnd):
-    x, y, border, title_height, width, height, scaling, ext_left_bounds, ext_top_bounds = get_window_bounds(
-        hwnd)
-    frame = bit_blt_capture_frame(hwnd, border, title_height, width, height, ext_left_bounds, ext_top_bounds)
-    return frame is not None
+    def test_is_not_pure_color(self):
+        frame = self.do_get_frame()
+        if frame is None:
+            logger.error(f'Failed to test_is_not_pure_color frame is None {self.hwnd_window}')
+            return False
+        else:
+            if is_close_to_pure_color(frame):
+                logger.error(f'Failed to test_is_not_pure_color failed {self.hwnd_window}')
+                return False
+            else:
+                return True
 
 
 def bit_blt_capture_frame(hwnd, border, title_height, width, height, ext_left_bounds, ext_top_bounds,

{ok-script-0.0.89 → ok-script-0.0.91}/ok/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -39,7 +39,11 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
     def frame_arrived_callback(self, x, y):
         try:
             self.last_frame_time = time.time()
-            self.last_dx_frame = self.frame_pool.TryGetNextFrame()
+            next_frame = self.frame_pool.TryGetNextFrame()
+            if next_frame is not None:
+                self.last_dx_frame = next_frame
+            else:
+                logger.warning('frame_arrived_callback TryGetNextFrame returned None')
         except Exception as e:
             logger.error(f"TryGetNextFrame error {e}")
             self.close()
@@ -47,7 +51,9 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
 
     def convert_dx_frame(self):
         frame = self.last_dx_frame
+        self.last_dx_frame = None
         if not frame:
+            logger.warning('convert_dx_frame self.last_dx_frame is none')
             return None
 
         need_reset_framepool = False
@@ -93,6 +99,7 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
             if e.winerror == d3d11.DXGI_ERROR_DEVICE_REMOVED or e.winerror == d3d11.DXGI_ERROR_DEVICE_RESET:
                 need_reset_framepool = True
                 need_reset_device = True
+                logger.error('convert_dx_frame win error', e)
             else:
                 raise e
         finally:
@@ -200,7 +207,6 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
             frame = self.convert_dx_frame()
             if frame is None:
                 return
-            self.last_dx_frame = None
             latency = time.time() - self.last_frame_time
 
             frame = self.crop_image(frame)
@@ -210,7 +216,7 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
                 if new_width <= 0 or new_width <= 0:
                     logger.warning(f"get_frame size <=0 {new_width}x{new_height}")
                     frame = None
-            if latency > 1:
+            if latency > 2:
                 logger.warning(f"latency too large return None frame: {latency}")
                 return None
             else:

{ok-script-0.0.89 → ok-script-0.0.91}/ok/color/Color.py

@@ -1,3 +1,6 @@
+import os
+from collections import defaultdict
+
 import cv2
 import numpy as np
 
@@ -16,6 +19,29 @@ white_color = {
 }
 
 
+def is_close_to_pure_color(image, max_colors=5000, percent=0.97):
+    image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
+
+    # Step 2: Initialize a dictionary to count color frequencies
+    color_counts = defaultdict(int)
+    # Step 3: Go through each pixel and count
+    for row in image:
+        for pixel in row:
+            # Convert the pixel tuple to a hashable type for counting
+            color = tuple(pixel)
+            color_counts[color] += 1
+            if len(color_counts) > max_colors:
+                return False
+
+    # Step 4: Find the most dominant color and its percentage
+    dominant_color = max(color_counts, key=color_counts.get)
+    dominant_count = color_counts[dominant_color]
+    total_pixels = image.shape[0] * image.shape[1]
+    percentage = (dominant_count / total_pixels)
+
+    return percentage > percent
+
+
 def calculate_colorfulness(image, box=None):
     if box is not None:
         image = image[box.y:box.y + box.height, box.x:box.x + box.width, :3]
@@ -146,3 +172,11 @@ def calculate_color_percentage(image, color_ranges, box=None):
     total_pixels = image.size / 3  # Divide by 3 for an RGB image
     percentage = target_pixels / total_pixels
     return percentage
+
+
+if __name__ == '__main__':
+    file = 'C:\\Users\\ok\Downloads\\ok-baijing (2)\\screenshots\\1.png'
+    exists = os.path.exists(file)
+    image = cv2.imread(file
+                       )
+    print(is_close_to_pure_color(image))

{ok-script-0.0.89 → ok-script-0.0.91}/ok/gui/StartController.py

@@ -83,7 +83,7 @@ class StartController(QObject):
                 "Game resolution {resolution} is not supported").format(resolution=resolution)
             if supported_ratio:
                 error += self.tr(', the supported ratio is {supported_ratio}').format(supported_ratio=supported_ratio)
-            if supported_ratio:
+            if min_size:
                 error += self.tr(', the supported min resolution is {min_size}').format(
                     min_size=f'{min_size[0]}x{min_size[1]}')
             error += self.tr(', check if game windows is minimized, resized or out of screen.')

{ok-script-0.0.89 → ok-script-0.0.91}/ok/interaction/BaseInteraction.py

@@ -34,3 +34,9 @@ class BaseInteraction:
             logger.debug(f"click {x, y}")
         else:
             logger.debug(f"click {name} {x, y}")
+
+    def right_click(self, x=-1, y=-1, move_back=False, name=None):
+        if name is None:
+            logger.debug(f"right_click {x, y}")
+        else:
+            logger.debug(f"right_click {name} {x, y}")

{ok-script-0.0.89 → ok-script-0.0.91}/ok/interaction/Win32Interaction.py

@@ -95,6 +95,24 @@ class Win32Interaction(BaseInteraction):
         if current_x != -1 and current_y != -1:
             pydirectinput.moveTo(current_x, current_y)
 
+    def right_click(self, x=-1, y=-1, move_back=False, name=None):
+        super().right_click(x, y, name=name)
+        if not self.capture.clickable():
+            logger.info(f"window in background, not clickable")
+            return
+        # Convert the x, y position to lParam
+        # lParam = win32api.MAKELONG(x, y)
+        current_x, current_y = -1, -1
+        if move_back:
+            current_x, current_y = pydirectinput.position()
+        if x != -1 and y != -1:
+            x, y = self.capture.get_abs_cords(x, y)
+            logger.info(f"left_click {x, y}")
+            pydirectinput.moveTo(x, y)
+        pydirectinput.rightClick()
+        if current_x != -1 and current_y != -1:
+            pydirectinput.moveTo(current_x, current_y)
+
     def mouse_down(self, x=-1, y=-1, name=None):
         if not self.capture.clickable():
             logger.info(f"window in background, not clickable")

{ok-script-0.0.89 → ok-script-0.0.91}/ok/task/BaseTask.py

@@ -151,7 +151,6 @@ class BaseTask(ExecutorOperation):
 
     def disable(self):
         self._enabled = False
-        self.executor.current_task = None
         communicate.task.emit(self)
 
     def run(self):

{ok-script-0.0.89 → ok-script-0.0.91}/ok/task/ExecutorOperation.py

@@ -57,6 +57,12 @@ class ExecutorOperation:
         self.executor.reset_scene()
         self.executor.interaction.mouse_up()
 
+    def right_click(self, x=-1, y=-1, move_back=False, name=None):
+        communicate.emit_draw_box("right_click", [Box(max(0, x - 10), max(0, y - 10), 20, 20, name="right_click")],
+                                  "green")
+        self.executor.reset_scene()
+        self.executor.interaction.right_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),
                    int(self.height * to_y), duration)
@@ -156,6 +162,9 @@ class ExecutorOperation:
         self.executor.sleep(timeout)
 
     def send_key(self, key, down_time=0.02):
+        frame = self.executor.nullable_frame()
+        communicate.emit_draw_box("send_key", [Box(max(0, 0), max(0, 0), 20, 20, name="send_key_" + str(key))], "green",
+                                  frame)
         self.executor.reset_scene()
         self.executor.interaction.send_key(key, down_time)
 

{ok-script-0.0.89 → ok-script-0.0.91}/ok/task/TaskExecutor.py

@@ -76,11 +76,11 @@ class TaskExecutor:
 
     def check_frame_and_resolution(self, supported_ratio, min_size):
         if supported_ratio is None or min_size is None:
-            return True, None
+            return True, '0x0'
         self.device_manager.update_resolution_for_hwnd()
         frame = self.method.get_frame()
         if frame is None:
-            return False, None
+            return False, '0x0'
         width = self.method.width
         height = self.method.height
         if height == 0:

{ok-script-0.0.89 → ok-script-0.0.91}/ok/update/Updater.py

@@ -97,7 +97,7 @@ for /D %%D in ("%source_dir%\*") do (
 echo %time% Update Success
 start "" %exe%
 endlocal
-pause
+
 
 goto :eof
 

{ok-script-0.0.89 → ok-script-0.0.91}/ok_script.egg-info/PKG-INFO

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

{ok-script-0.0.89 → ok-script-0.0.91}/setup.py

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