ok-script 0.0.128__tar.gz → 0.0.129__tar.gz

{ok-script-0.0.128/ok_script.egg-info → ok-script-0.0.129}/PKG-INFO

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

{ok-script-0.0.128 → ok-script-0.0.129}/ok/capture/adb/DeviceManager.py

@@ -45,7 +45,7 @@ class DeviceManager:
         self.config = Config("devices", {"preferred": "none", "pc_full_path": "none", 'capture': 'windows'})
         self.capture_method = None
         self.handler = Handler(exit_event, 'RefreshAdb')
-        self.handler.post(self.do_refresh, 3)
+        self.handler.post(self.do_refresh)
 
     def refresh(self):
         logger.debug('calling refresh')

{ok-script-0.0.128 → ok-script-0.0.129}/ok/feature/Box.py

@@ -141,6 +141,13 @@ class Box:
         return None
 
 
+def find_highest_confidence_box(boxes):
+    if not boxes:
+        return None
+    highest_confidence_box = max(boxes, key=lambda box: box.confidence)
+    return highest_confidence_box
+
+
 def sort_boxes(boxes: List[Box]) -> List[Box]:
     def box_intersect(box1, box2):
         return not (box1.y > box2.y + box2.height or box1.y + box1.height < box2.y)

{ok-script-0.0.128 → ok-script-0.0.129}/ok/feature/FindFeature.py

@@ -1,7 +1,10 @@
 import sys
 from typing import List
 
-from ok.feature.Box import Box
+from ok.feature.Box import Box, find_highest_confidence_box
+from ok.logging.Logger import get_logger
+
+logger = get_logger(__name__)
 
 
 class FindFeature:
@@ -73,15 +76,10 @@ class FindFeature:
                                   use_gray_scale=use_gray_scale, box=box, canny_lower=canny_lower,
                                   canny_higher=canny_higher, inverse_mask_color=inverse_mask_color,
                                   frame_processor=frame_processor)
-        highest_conf = 0
-        highest_box = None
         if len(boxes) > 0:
             if len(boxes) > 1:
-                print(f"find_one:found {feature_name} too many {len(boxes)}", file=sys.stderr)
-            for box in boxes:
-                if box.confidence > highest_conf:
-                    highest_conf = box.confidence
-                    highest_box = box
+                logger.warning(f"find_one:found {feature_name} too many {len(boxes)}", file=sys.stderr)
+            highest_box = find_highest_confidence_box(boxes)
             return highest_box
 
     def on_feature(self, boxes):

{ok-script-0.0.128 → ok-script-0.0.129}/ok/gui/i18n/GettextTranslator.py

@@ -38,9 +38,9 @@ def update_po_file(strings, language_code):
             po.append(entry)
 
     # Remove obsolete keys
-    for msgid in list(existing_ids.keys()):
-        if msgid not in strings:
-            po.remove(existing_ids[msgid])
+    # for msgid in list(existing_ids.keys()):
+    #     if msgid not in strings:
+    #         po.remove(existing_ids[msgid])
 
     # Save the .po file
     po.wrapwidth = 999999

{ok-script-0.0.128 → ok-script-0.0.129}/ok/task/BaseTask.py

@@ -29,14 +29,16 @@ class BaseTask(ExecutorOperation):
         self.lock = threading.Lock()
         self._handler = None
         self.running = False
-        self.check_trigger_interval = 0
-        self.last_check_trigger_time = 0
+        self.trigger_interval = 0
+        self.last_trigger_time = 0
 
-    def should_check_trigger(self):
+    def should_trigger(self):
+        if self.trigger_interval == 0:
+            return True
         now = time.time()
-        time_diff = now - self.last_check_trigger_time
-        if time_diff > self.check_trigger_interval:
-            self.last_check_trigger_time = now
+        time_diff = now - self.last_trigger_time
+        if time_diff > self.trigger_interval:
+            self.last_trigger_time = now
             return True
         return False
 

{ok-script-0.0.128 → ok-script-0.0.129}/ok/task/TaskExecutor.py

@@ -248,7 +248,7 @@ class TaskExecutor:
                 cycled = True
             self.trigger_task_index += 1
             task = self.trigger_tasks[self.trigger_task_index]
-            if task.enabled and task.should_check_trigger():
+            if task.enabled and task.should_trigger():
                 return task, cycled
         return None, cycled
 
@@ -267,8 +267,9 @@ class TaskExecutor:
                 continue
             if cycled:
                 self.next_frame()
-            elif time.time() - self._last_frame_time > 1:
-                logger.warning(f'processing cost too much time, get new frame')
+            elif time.time() - self._last_frame_time > 0.1:
+                # logger.warning(
+                #     f'processing {task} cost too much time {time.time() - self._last_frame_time}, get new frame')
                 self.next_frame()
             try:
                 if task.trigger():

{ok-script-0.0.128 → ok-script-0.0.129}/ok/task/TriggerTask.py

@@ -9,6 +9,7 @@ class TriggerTask(BaseTask):
     def __init__(self):
         super().__init__()
         self.default_config['_enabled'] = False
+        self.trigger_interval
 
     def on_create(self):
         self._enabled = self.config.get('_enabled', False)

{ok-script-0.0.128 → ok-script-0.0.129}/ok/update/GithubMultiDownloader.py

@@ -14,11 +14,9 @@ logger = get_logger(__name__)
 
 # https://update.greasyfork.org/scripts/412245/Github%20%E5%A2%9E%E5%BC%BA%20-%20%E9%AB%98%E9%80%9F%E4%B8%8B%E8%BD%BD.user.js
 download_url_us = [
-    ['https://gh.h233.eu.org/https://github.com', '美国',
-     '[美国 Cloudflare CDN] - 该公益加速源由 [@X.I.U/XIU2] 提供'],
-    [
-        'https://gh.ddlc.top/https://github.com', '美国',
-        '[美国 Cloudflare CDN] - 该公益加速源由 [@mtr-static-official] 提供'],
+    ['https://gh.h233.eu.org/https://github.com', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [@X.I.U/XIU2] 提供'],
+    ['https://gh.ddlc.top/https://github.com', '美国',
+     '[美国 Cloudflare CDN] - 该公益加速源由 [@mtr-static-official] 提供'],
     ['https://dl.ghpig.top/https://github.com', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [feizhuqwq.com] 提供'],
     ['https://slink.ltd/https://github.com', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [知了小站] 提供'],
     ['https://gh.con.sh/https://github.com', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [佚名] 提供'],
@@ -35,11 +33,9 @@ download_url_us = [
      '[美国 Cloudflare CDN] - 该公益加速源由 [@yionchiii lau] 提供'],
     ['https://gh.jiasu.in/https://github.com', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [@0-RTT] 提供'],
     ['https://dgithub.xyz', '美国', '[美国 西雅图] - 该公益加速源由 [dgithub.xyz] 提供'],
-    ['https://download.ixnic.net', '美国', '[美国 洛杉矶] - 该公益加速源由 [FastGit 群组成员] 提供'],
+    ['https://download.ixnic.net', '美国', '[美国 洛杉矶] - 该公益加速源由 [@黃埔興國] 提供'],
     ['https://download.nuaa.cf', '美国', '[美国 洛杉矶] - 该公益加速源由 [FastGit 群组成员] 提供'],
-    ['https://download.yzuu.cf', '美国', '[美国 纽约] - 该公益加速源由 [FastGit 群组成员] 提供'],
-    ['https://download.scholar.rr.nu', '美国', '[美国 纽约] - 该公益加速源由 [FastGit 群组成员] 提供'],
-    ['https://hub.whtrys.space', '美国', '[美国 Cloudflare CDN] - 该公益加速源由 [FastGit 群组成员] 提供']
+    ['https://download.yzuu.cf', '美国', '[美国 纽约] - 该公益加速源由 [FastGit 群组成员] 提供']
 ]
 
 download_url = [
@@ -48,7 +44,7 @@ download_url = [
     ['https://ghproxy.net/https://github.com', '日本',
      '[日本 大阪] - 该公益加速源由 [ghproxy] 提供

提示：希望大家尽量多使用前面的美国节点（每次随机 负载均衡），
避免流量都集中到亚洲公益节点，减少成本压力，公益才能更持久~'],
     ['https://kkgithub.com', '香港',
-     '[中国香港、日本、新加坡等] - 该公益加速源由 [help.kkgithub.com] 提供

提示：希望大家尽量多使用前面的美国节点（每次随机 4 个来负载均衡），
避免流量都集中到亚洲公益节点，减少成本压力，公益才能更持久~']
+     '[中国香港、日本、新加坡等] - 该公益加速源由 [help.kkgithub.com] 提供

提示：希望大家尽量多使用前面的美国节点（每次随机 4 个来负载均衡），
避免流量都集中到亚洲公益节点，减少成本压力，公益才能更持久~'],
 ]
 
 
@@ -63,12 +59,13 @@ class GithubMultiDownloader:
     def __init__(self, app_config, exit_event):
         self.app_config = app_config
         self.exit_event = exit_event
-        self.proxys = [""] + parse_url(download_url_us) + parse_url(download_url)
+        self.proxys = parse_url(download_url) + parse_url(download_url_us)
         logger.debug(f'proxys = {self.proxys}')
         self.fast_proxys = []
         random.shuffle(self.proxys)
+        self.proxys = ["", "", "", "", ""] + self.proxys  # try to use no proxy first
         self.lock = threading.Lock()
-        self.num_parts = 6
+        self.num_parts = 5
         self.downloaded = 0
         self.start_time = 0
         self.size = 0
@@ -131,7 +128,7 @@ class GithubMultiDownloader:
             with open(file, 'ab') as f:
                 for chunk in response.iter_content(chunk_size=1024):  # 1 KB chunks
                     with self.lock:
-                        if time.time() - last_chunk_time > 0.5:  # If more than 1 seconds have passed since the last chunk
+                        if time.time() - last_chunk_time > 1 and time.time() - start_time > 10:  # If more than 1 seconds have passed since the last chunk
                             response.close()
                             logger.error(f'{proxy} Server is not responding with the chunk every 0.5 seconds')
                             break

{ok-script-0.0.128 → ok-script-0.0.129}/ok/update/Updater.py

@@ -99,7 +99,7 @@ for /D %%D in ("%source_dir%\*") do (
     xcopy /E /I "%%D" "%target_dir%\%%~nxD" >nul
 )
 echo %time% Update Success
-start "" %exe%
+start "" "%exe%"
 endlocal
 
 
@@ -109,8 +109,10 @@ goto :eof
 set "elapsed_time=0"
 :check_loop
 echo %time% - Waiting for PID %1 to exit...
-tasklist /fi "PID eq %1" | find ":" >nul
-if errorlevel 1 (
+tasklist /fi "PID eq %1" | find /C "Image Name" > temp.txt
+set /p count=<temp.txt
+del temp.txt
+if %count% leq 1 (
     echo %time% - PID %1 has exited.
     goto :eof
 ) else (
@@ -160,8 +162,10 @@ class Updater:
     def do_check_for_updates(self, proxied_url=None):
 
         try:
+            url = proxied_url or self.update_url
+            logger.info(f'do_check_for_updates: {url}')
             # Send GET request to the API endpoint
-            response = requests.get(proxied_url or self.update_url)
+            response = requests.get(url, timeout=10)
 
             # Raise an exception if the request was unsuccessful
             response.raise_for_status()
@@ -243,7 +247,7 @@ class Updater:
         except Exception as e:
             logger.error('download error occurred', e)
             self.downloading = False
-            communicate.download_update.emit(0, "", True, e.args[0])
+            communicate.download_update.emit(0, "", True, "download error")
 
     def extract(self, file, release, debug):
         version = release.get('version')
@@ -261,6 +265,7 @@ class Updater:
             logger.error('extract error occurred', e)
             self.check_package_error()
             return
+
         update_package_folder = find_folder_with_file(folder, 'md5.txt')
 
         if update_package_folder is None:

{ok-script-0.0.128 → ok-script-0.0.129/ok_script.egg-info}/PKG-INFO

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

{ok-script-0.0.128 → ok-script-0.0.129}/setup.py

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