ok-script 0.0.32__tar.gz → 0.0.33__tar.gz

{ok-script-0.0.32 → ok-script-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.32
+Version: 0.0.33
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -11,14 +11,14 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: adbutils~=2.6.2
-Requires-Dist: numpy~=1.26.4
-Requires-Dist: PyDirectInput~=1.0.4
+Requires-Dist: adbutils==2.7.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: PyDirectInput==1.0.4
 Requires-Dist: pywin32==306
-Requires-Dist: typing-extensions~=4.11.0
-Requires-Dist: PySide6~=6.7.0
-Requires-Dist: PySide6-Fluent-Widgets~=1.5.6
-Requires-Dist: opencv-python~=4.9.0.80
+Requires-Dist: typing-extensions==4.11.0
+Requires-Dist: PySide6==6.7.0
+Requires-Dist: PySide6-Fluent-Widgets==1.5.6
+Requires-Dist: opencv-python==4.9.0.80
 
 # ok-script
 

{ok-script-0.0.32 → ok-script-0.0.33}/ok/capture/adb/DeviceManager.py

@@ -1,11 +1,7 @@
-import os
-import subprocess
 import threading
 
 import adbutils
 import win32gui
-from adbutils import adb_path
-from adbutils.errors import AdbConnectionError, AdbTimeout
 
 from ok.capture.HwndWindow import HwndWindow, find_hwnd_by_title_and_exe
 from ok.capture.adb.ADBCaptureMethod import ADBCaptureMethod, do_screencap
@@ -21,19 +17,6 @@ from ok.logging.Logger import get_logger
 logger = get_logger(__name__)
 
 
-def fix_adbutils_safe_connect(self):
-    try:
-        return self._create_socket()
-    except (AdbConnectionError, AdbTimeout):
-        flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
-        subprocess.run([adb_path(), "start-server"], timeout=20.0,
-                       creationflags=flags)  # 20s should enough for adb start
-        return self._create_socket()
-
-
-adbutils._adb.AdbConnection._safe_connect = fix_adbutils_safe_connect
-
-
 class DeviceManager:
 
     def __init__(self, config_folder, hwnd_title=None, exe_name=None, debug=False, exit_event=None):

{ok-script-0.0.32 → ok-script-0.0.33}/ok/task/TaskExecutor.py

@@ -196,14 +196,13 @@ class TaskExecutor:
         processing_time = 0
         while not self.exit_event.is_set():
             try:
-                task, cycled = self.next_task()
-                if not task:
+                self.current_task, cycled = self.next_task()
+                if not self.current_task:
                     time.sleep(1)
                     continue
-                self.current_task = task
-                if isinstance(task, OneTimeTask):
-                    task.running = True
-                    communicate.task.emit(task)
+                if isinstance(self.current_task, OneTimeTask):
+                    self.current_task.running = True
+                    communicate.task.emit(self.current_task)
                 if cycled or self._frame is None:
                     self.next_frame()
                     processing_time = 0
@@ -213,14 +212,14 @@ class TaskExecutor:
                     self.next_frame()
                 self.detect_scene()
                 start = time.time()
-                result = task.run()
+                result = self.current_task.run()
                 processing_time += time.time() - start
-                if result and isinstance(task, TriggerTask):
-                    task.trigger_count += 1
-                    communicate.task.emit(task)
-                elif isinstance(task, OneTimeTask):
-                    task.set_done()
-                    communicate.task.emit(task)
+                if result and isinstance(self.current_task, TriggerTask):
+                    self.current_task.trigger_count += 1
+                    communicate.task.emit(self.current_task)
+                elif isinstance(self.current_task, OneTimeTask):
+                    self.current_task.set_done()
+                    communicate.task.emit(self.current_task)
                 self.current_task = None
             except TaskDisabledException:
                 logger.info(f"task is disabled, go to next task")
@@ -228,13 +227,15 @@ class TaskExecutor:
                 logger.info(f"FinishedException, breaking")
                 break
             except Exception as e:
+                if self.current_task is not None:
+                    self.current_task.disable()
                 traceback.print_exc()
                 stack_trace_str = traceback.format_exc()
-                logger.error(f"{task.name} exception: {e}, traceback: {stack_trace_str}")
+                logger.error(f"{self.current_task.name} exception: {e}, traceback: {stack_trace_str}")
             self.current_task = None
-            if isinstance(task, OneTimeTask):
-                task.running = False
-                communicate.task.emit(task)
+            if isinstance(self.current_task, OneTimeTask):
+                self.current_task.running = False
+                communicate.task.emit(self.current_task)
         logger.debug(f'exit_event is set, destroy all tasks')
         for task in self.onetime_tasks:
             task.on_destroy()

{ok-script-0.0.32 → ok-script-0.0.33}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.32
+Version: 0.0.33
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -11,14 +11,14 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: adbutils~=2.6.2
-Requires-Dist: numpy~=1.26.4
-Requires-Dist: PyDirectInput~=1.0.4
+Requires-Dist: adbutils==2.7.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: PyDirectInput==1.0.4
 Requires-Dist: pywin32==306
-Requires-Dist: typing-extensions~=4.11.0
-Requires-Dist: PySide6~=6.7.0
-Requires-Dist: PySide6-Fluent-Widgets~=1.5.6
-Requires-Dist: opencv-python~=4.9.0.80
+Requires-Dist: typing-extensions==4.11.0
+Requires-Dist: PySide6==6.7.0
+Requires-Dist: PySide6-Fluent-Widgets==1.5.6
+Requires-Dist: opencv-python==4.9.0.80
 
 # ok-script
 

ok-script-0.0.33/ok_script.egg-info/requires.txt

@@ -0,0 +1,8 @@
+adbutils==2.7.1
+numpy==1.26.4
+PyDirectInput==1.0.4
+pywin32==306
+typing-extensions==4.11.0
+PySide6==6.7.0
+PySide6-Fluent-Widgets==1.5.6
+opencv-python==4.9.0.80

{ok-script-0.0.32 → ok-script-0.0.33}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.32",
+    version="0.0.33",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",
@@ -20,14 +20,14 @@ setuptools.setup(
         "Operating System :: Microsoft :: Windows",
     ],
     install_requires=[
-        'adbutils~=2.6.2',
-        'numpy~=1.26.4',
-        'PyDirectInput~=1.0.4',
+        'adbutils==2.7.1',
+        'numpy==1.26.4',
+        'PyDirectInput==1.0.4',
         'pywin32==306',
-        'typing-extensions~=4.11.0',
-        'PySide6~=6.7.0',
-        'PySide6-Fluent-Widgets~=1.5.6',
-        'opencv-python~=4.9.0.80'
+        'typing-extensions==4.11.0',
+        'PySide6==6.7.0',
+        'PySide6-Fluent-Widgets==1.5.6',
+        'opencv-python==4.9.0.80'
     ],
     python_requires='>=3.6',
 )

ok-script-0.0.32/ok_script.egg-info/requires.txt

@@ -1,8 +0,0 @@
-adbutils~=2.6.2
-numpy~=1.26.4
-PyDirectInput~=1.0.4
-pywin32==306
-typing-extensions~=4.11.0
-PySide6~=6.7.0
-PySide6-Fluent-Widgets~=1.5.6
-opencv-python~=4.9.0.80