ok-script 0.0.330__tar.gz → 0.0.332__tar.gz

{ok_script-0.0.330/ok_script.egg-info → ok_script-0.0.332}/PKG-INFO

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

{ok_script-0.0.330 → ok_script-0.0.332}/ok/analytics/Analytics.py

@@ -10,7 +10,7 @@ import wmi
 import ok.gui
 from ok.config.Config import Config
 from ok.logging.Logger import get_logger
-from ok.util.Handler import Handler
+from ok.Util import Handler
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/capture/windows/dump.py

@@ -4,7 +4,7 @@ import sys
 import threading
 import traceback
 
-from ok.util.path import get_relative_path
+from ok.Util import get_relative_path
 
 
 def get_thread_name(thread_id):

{ok_script-0.0.330 → ok_script-0.0.332}/ok/config/Config.py

@@ -1,7 +1,7 @@
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
-from ok.util.json import read_json_file, write_json_file
-from ok.util.path import get_relative_path
+from ok.Util import read_json_file, write_json_file
+from ok.Util import get_relative_path
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/feature/FeatureSet.py

@@ -16,7 +16,7 @@ from ok.logging.Logger import get_logger
 from typing import Dict
 from typing import List
 
-from ok.util.path import get_path_relative_to_exe
+from ok.Util import get_path_relative_to_exe
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/App.py

@@ -15,7 +15,7 @@ from ok.gui.overlay.OverlayWindow import OverlayWindow
 from ok.gui.util.app import init_app_config
 from ok.logging.Logger import get_logger
 from ok.update.GitUpdater import GitUpdater
-from ok.util.path import get_path_relative_to_exe
+from ok.Util import get_path_relative_to_exe
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/StartController.py

@@ -2,14 +2,14 @@ import time
 
 from PySide6.QtCore import QObject
 from ok.Capture import BaseWindowsCaptureMethod
+from ok.Util import Handler
+from ok.Util import is_admin
 
 import ok.gui
 from ok.alas.platform_windows import execute
 from ok.gui.Communicate import communicate
 from ok.gui.util.Alert import alert_error
 from ok.logging.Logger import get_logger
-from ok.util.Handler import Handler
-from ok.util.win import is_admin
 
 logger = get_logger(__name__)
 
@@ -113,19 +113,22 @@ class StartController(QObject):
                 'supported_resolution', {})
             supported_ratio = supported_resolution.get('ratio')
             min_size = supported_resolution.get('min_size')
+            resize_to_ratio = supported_resolution.get('resize_to_ratio')
             supported, resolution = ok.gui.executor.check_frame_and_resolution(supported_ratio, min_size)
             if not supported:
-                error = self.tr(
-                    'Resolution {resolution} check failed, some tasks might not work correctly!').format(
-                    resolution=resolution)
-                if supported_ratio:
-                    error += self.tr(', the supported ratio is {supported_ratio}').format(
-                        supported_ratio=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]}')
-                alert_error(error, True)
-                # return error
+                resize_success = False
+                if resize_to_ratio and isinstance(ok.gui.device_manager.capture_method, BaseWindowsCaptureMethod):
+                    resize_success = ok.gui.device_manager.capture_method.hwnd_window.try_resize_to(supported_ratio)
+                if not resize_success:
+                    error = self.tr(
+                        'Resolution {resolution} check failed, some tasks might not work correctly!').format(
+                        resolution=resolution)
+                    if supported_ratio:
+                        error += self.tr(', the supported ratio is {supported_ratio}').format(
+                            supported_ratio=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]}')
             if device and device['device'] == "windows" and not is_admin():
                 return self.tr(
                     f"PC version requires admin privileges, Please restart this app with admin privileges!")

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/common/config.py

@@ -4,7 +4,7 @@ from enum import Enum
 
 from PySide6.QtCore import QLocale
 
-from ok.util.path import get_relative_path
+from ok.Util import get_relative_path
 from qfluentwidgets import (qconfig, QConfig, ConfigItem, OptionsConfigItem, BoolValidator,
                             OptionsValidator, RangeConfigItem, RangeValidator,
                             ConfigSerializer, Theme, EnumSerializer)

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/debug/DebugTab.py

@@ -17,7 +17,7 @@ from ok.gui.widget.Tab import Tab
 from ok.interaction.DoNothingInteraction import DoNothingInteraction
 from ok.logging.Logger import get_logger, exception_to_str
 from ok.ocr.OCR import OCR
-from ok.util.Handler import Handler
+from ok.Util import Handler
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/debug/Screenshot.py

@@ -13,7 +13,7 @@ import ok.gui
 from ok.feature.Box import Box
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
-from ok.util.path import find_first_existing_file, clear_folder, sanitize_filename, \
+from ok.Util import find_first_existing_file, clear_folder, sanitize_filename, \
     get_relative_path
 
 logger = get_logger(__name__)

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/i18n/GettextTranslator.py

@@ -1,7 +1,7 @@
 import gettext
 import os
 
-from ok.util.path import ensure_dir_for_file, resource_path, get_path_relative_to_exe
+from ok.Util import ensure_dir_for_file, resource_path, get_path_relative_to_exe
 
 
 def __get_root():

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/launcher/Launcher.py

@@ -5,7 +5,7 @@ from ok.gui.launcher.LauncherWindow import LauncherWindow
 from ok.gui.util.app import init_app_config, center_window
 from ok.logging.Logger import get_logger, config_logger
 from ok.update.GitUpdater import GitUpdater
-from ok.util.exit_event import ExitEvent
+from ok.Util import ExitEvent
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/launcher/LauncherWindow.py

@@ -10,7 +10,7 @@ from ok.gui.launcher.UpdateBar import UpdateBar
 from ok.gui.util.app import show_info_bar
 from ok.gui.widget.BaseWindow import BaseWindow
 from ok.logging.Logger import get_logger
-from ok.util.path import get_path_relative_to_exe
+from ok.Util import get_path_relative_to_exe
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/start/SelectCaptureListView.py

@@ -22,17 +22,13 @@ class SelectCaptureListView(ListWidget):
             elif device.get('emulator') is not None:
                 title = self.tr("ADB(Supports Background, Slow, High Compatibility, High Latency)")
                 if self.count() == 1:
-                    item = QListWidgetItem(self.tr("Emulator Window(Supports Background, Fast, Low Latency)"))
-                    self.addItem(item)
                     from ok.alas.emulator_windows import Emulator
                     if device.get('emulator') and device.get('emulator').type == Emulator.MuMuPlayer12:
                         item = QListWidgetItem(self.tr("Ipc (MuMuPlayer12 version >= 4.0)"))
                         self.addItem(item)
-                        selected = 2
-                if ok.gui.device_manager.get_preferred_capture() == "windows":
+                        selected = 1
+                if ok.gui.device_manager.get_preferred_capture() == "ipc":
                     selected = 1
-                elif ok.gui.device_manager.get_preferred_capture() == "ipc":
-                    selected = 2
             else:
                 title = self.tr("ADB(Supports Background, Slow, High Compatibility, High Latency)")
                 self.reduce_row_to_1()

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/start/StartCard.py

@@ -10,7 +10,7 @@ from ok.gui.Communicate import communicate
 from ok.gui.debug.DebugTab import capture
 from ok.gui.widget.StatusBar import StatusBar
 from ok.logging.Logger import get_logger
-from ok.util.Handler import Handler
+from ok.Util import Handler
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/start/StartTab.py

@@ -63,8 +63,6 @@ class StartTab(Tab):
                 if i == 0:
                     ok.gui.device_manager.set_capture("adb")
                 elif i == 1:
-                    ok.gui.device_manager.set_capture("windows")
-                elif i == 2:
                     ok.gui.device_manager.set_capture("ipc")
             elif device.get('device') == 'windows':
                 ok.gui.device_manager.set_capture("windows")

{ok_script-0.0.330 → ok_script-0.0.332}/ok/gui/tasks/LabelAndDropDown.py

@@ -2,7 +2,7 @@ from qfluentwidgets import ComboBox
 
 import ok.gui
 from ok.gui.tasks.ConfigLabelAndWidget import ConfigLabelAndWidget
-from ok.util.list import find_index_in_list
+from ok.Util import find_index_in_list
 
 
 class LabelAndDropDown(ConfigLabelAndWidget):

{ok_script-0.0.330 → ok_script-0.0.332}/ok/interaction/PyDirectInteraction.py

@@ -5,7 +5,7 @@ import pydirectinput
 from ok.Capture import BaseCaptureMethod
 from ok.interaction.BaseInteraction import BaseInteraction
 from ok.logging.Logger import get_logger
-from ok.util.win import is_admin
+from ok.Util import is_admin
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/logging/Logger.py

@@ -5,8 +5,6 @@ import sys
 import traceback
 from logging.handlers import TimedRotatingFileHandler, QueueHandler, QueueListener
 
-from ok.util.path import ensure_dir_for_file, get_relative_path
-
 
 class CommunicateHandler(logging.Handler):
     def __init__(self):
@@ -45,6 +43,7 @@ def log_exception_handler(exc_type, exc_value, exc_traceback):
 
 
 def config_logger(config=None, name='ok-script'):
+    from ok.Util import ensure_dir_for_file, get_relative_path
     if not config:
         config = {'debug': True}
     if config.get('debug'):

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/DownloadMonitor.py

@@ -5,7 +5,7 @@ import re
 import threading
 from ok.gui.Communicate import communicate
 from ok.logging.Logger import get_logger
-from ok.util.path import get_folder_size
+from ok.Util import get_folder_size
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/GitUpdater.py

@@ -19,8 +19,8 @@ from ok.logging.LogTailer import LogTailer
 from ok.logging.Logger import get_logger
 from ok.update.DownloadMonitor import DownloadMonitor
 from ok.update.python_env import create_venv, find_line_in_requirements, get_env_path, modify_venv_cfg
-from ok.util.Handler import Handler
-from ok.util.path import get_relative_path, delete_if_exists, delete_folders_starts_with
+from ok.Util import Handler
+from ok.Util import get_relative_path, delete_if_exists, delete_folders_starts_with
 
 logger = get_logger(__name__)
 
@@ -399,7 +399,7 @@ class GitUpdater:
             import git
             repo = git.Repo.clone_from(self.url, path, branch=version, depth=depth)
         else:
-            repo.git.fetch('origin', f'refs/tags/{version}:refs/tags/{version}', '--depth=1')
+            repo.git.fetch('origin', f'refs/tags/{version}:refs/tags/{version}', '--depth=1', '--force')
             repo.git.checkout(version, force=True)
         fix_version_in_repo(path, version)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/gen_md5.py

@@ -1,7 +1,7 @@
 import sys
 
 import os.path
-from ok.util.path import dir_checksum, delete_if_exists
+from ok.Util import dir_checksum, delete_if_exists
 
 
 def write_checksum_to_file(folder_path):

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/package_full_with_profile.py

@@ -6,7 +6,7 @@ import json
 import subprocess
 from ok.logging.Logger import config_logger, get_logger
 from ok.update.init_launcher_env import create_app_env
-from ok.util.path import delete_if_exists
+from ok.Util import delete_if_exists
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/package_launcher.py

@@ -9,7 +9,7 @@ from ok.config.Config import Config
 from ok.logging.Logger import config_logger, get_logger
 from ok.update.GitUpdater import copy_exe_files, fix_version_in_repo
 from ok.update.init_launcher_env import create_launcher_env
-from ok.util.path import dir_checksum, delete_if_exists
+from ok.Util import dir_checksum, delete_if_exists
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332}/ok/update/python_env.py

@@ -3,7 +3,7 @@ import sys
 import shutil
 import subprocess
 from ok.logging.Logger import get_logger
-from ok.util.path import delete_if_exists
+from ok.Util import delete_if_exists
 
 logger = get_logger(__name__)
 

{ok_script-0.0.330 → ok_script-0.0.332/ok_script.egg-info}/PKG-INFO

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

{ok_script-0.0.330 → ok_script-0.0.332}/ok_script.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ setup.py
 ok/Capture.cp312-win_amd64.pyd
 ok/OK.cp312-win_amd64.pyd
 ok/Task.cp312-win_amd64.pyd
+ok/Util.cp312-win_amd64.pyd
 ok/__init__.py
 ok/alas/__init__.py
 ok/alas/emulator_base.py
@@ -179,17 +180,7 @@ ok/update/package_full_with_profile.py
 ok/update/package_launcher.py
 ok/update/push_repos.py
 ok/update/python_env.py
-ok/util/Handler.py
 ok/util/__init__.py
-ok/util/clazz.py
-ok/util/exit_event.py
-ok/util/json.py
-ok/util/list.py
-ok/util/path.py
-ok/util/thread.py
-ok/util/win.py
-ok/util/win32_process.py
-ok/util/yaml.py
 ok_script.egg-info/PKG-INFO
 ok_script.egg-info/SOURCES.txt
 ok_script.egg-info/dependency_links.txt

{ok_script-0.0.330 → ok_script-0.0.332}/setup.py

@@ -47,7 +47,7 @@ extensions = find_pyx_packages(base_dir)
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.330",
+    version="0.0.332",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",

ok_script-0.0.330/ok/util/Handler.py

@@ -1,82 +0,0 @@
-import heapq
-import threading
-import time
-from dataclasses import dataclass, field
-
-from ok.logging.Logger import get_logger
-from ok.util.exit_event import ExitEvent
-
-logger = get_logger(__name__)
-
-
-@dataclass(order=True)
-class ScheduledTask:
-    execute_at: float
-    task: callable = field(compare=False)
-
-
-class Handler:
-    def __init__(self, event: ExitEvent, name=None):
-        self.task_queue = []
-        self.executing = None
-        self.condition = threading.Condition()
-        self.exit_event = event
-        self.exit_event.bind_stop(self)
-        self.thread = threading.Thread(target=self._process_tasks, name=name)
-        self.thread.start()
-
-    def _process_tasks(self):
-        while not self.exit_event.is_set():
-            with self.condition:
-                while not self.task_queue:
-                    self.condition.wait()
-
-            now = time.time()
-            self.condition.acquire()
-            if self.task_queue and self.task_queue[0].execute_at <= now:
-                scheduled_task = heapq.heappop(self.task_queue)
-                self.condition.release()
-                if scheduled_task.task is None:
-                    logger.debug(f'stopping handler {self.thread.name}')
-                    return
-                self.executing = scheduled_task.task
-                try:
-                    scheduled_task.task()
-                except Exception as e:
-                    logger.error(f'handler {self.thread.name} raised exception', e)
-                self.executing = None
-            else:
-                if self.task_queue:
-                    next_time = self.task_queue[0].execute_at
-                    timeout = next_time - now
-                    if timeout > 0:
-                        self.condition.wait(timeout=timeout)
-                self.condition.release()
-
-    def post(self, task, delay=0, remove_existing=False, skip_if_running=False):
-        with self.condition:
-            if self.exit_event.is_set():
-                logger.error(f'post handler {self.thread.name} already exits')
-                self.condition.notify_all()
-                return
-            if remove_existing and len(self.task_queue) > 0:
-                for obj in self.task_queue.copy():
-                    if obj.task == task:
-                        self.task_queue.remove(obj)
-                        logger.debug(f'removing duplicate task {task}')
-            if skip_if_running and self.executing == task:
-                logger.debug(f'skipping duplicate task {task}')
-                return
-            if delay > 0:
-                scheduled_task = ScheduledTask(time.time() + delay, task)
-            else:
-                scheduled_task = ScheduledTask(0, task)
-            heapq.heappush(self.task_queue, scheduled_task)
-            self.condition.notify_all()
-            return True
-
-    def stop(self):
-        with self.condition:
-            self.task_queue.clear()
-            heapq.heappush(self.task_queue, ScheduledTask(0, None))
-            self.condition.notify_all()

ok_script-0.0.330/ok/util/clazz.py

@@ -1,7 +0,0 @@
-import importlib
-
-
-def init_class_by_name(module_name, class_name, *args, **kwargs):
-    module = importlib.import_module(module_name)
-    class_ = getattr(module, class_name)
-    return class_(*args, **kwargs)

ok_script-0.0.330/ok/util/exit_event.py

@@ -1,25 +0,0 @@
-import threading
-
-from ok.logging.Logger import get_logger
-
-logger = get_logger(__name__)
-
-
-class ExitEvent(threading.Event):
-    queues = set()
-    to_stops = set()
-
-    def bind_queue(self, queue):
-        self.queues.add(queue)
-
-    def bind_stop(self, to_stop):
-        self.to_stops.add(to_stop)
-
-    def set(self):
-        super(ExitEvent, self).set()
-        logger.debug(f"ExitEvent set event empty queues {self.queues} to_stops: {self.to_stops}")
-        for queue in self.queues:
-            queue.put(None)
-
-        for to_stop in self.to_stops:
-            to_stop.stop()

ok_script-0.0.330/ok/util/json.py

@@ -1,23 +0,0 @@
-import json
-import os
-
-from ok.util.path import ensure_dir_for_file
-
-
-def read_json_file(file_path) -> dict | None:
-    if not os.path.exists(file_path):
-        return None
-
-    try:
-        with open(file_path, 'r', encoding='utf-8') as f:
-            data = json.load(f)
-        return data
-    except json.JSONDecodeError:
-        return None
-
-
-def write_json_file(file_path, data):
-    ensure_dir_for_file(file_path)
-    with open(file_path, 'w', encoding='utf-8') as f:
-        json.dump(data, f, indent=4, ensure_ascii=False)
-    return True

ok_script-0.0.330/ok/util/list.py

@@ -1,17 +0,0 @@
-def get_first_item(lst, default=None):
-    return next(iter(lst), default) if lst is not None else default
-
-
-def safe_get(lst, idx, default=None):
-    try:
-        return lst[idx]
-    except IndexError:
-        return default
-
-
-def find_index_in_list(my_list, target_string, default_index=-1):
-    try:
-        index = my_list.index(target_string)
-        return index
-    except ValueError:
-        return default_index