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

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

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

{ok-script-0.0.88 → ok-script-0.0.89}/ok/gui/debug/LogWindow.py

@@ -69,6 +69,8 @@ class LogModel(QAbstractListModel):
         self.beginInsertRows(QModelIndex(), self.rowCount(QModelIndex()), self.rowCount(QModelIndex()))
         self.do_filter_logs()
         self.endInsertRows()
+        self.layoutChanged.emit()
+        self.log_list.scrollToBottom()
 
     def do_filter_logs(self):
 

{ok-script-0.0.88 → ok-script-0.0.89}/ok/ocr/OCR.py

@@ -55,13 +55,13 @@ class OCR:
                     pos = res[0]
                     text = res[1]
                     confidence = res[2]
-                    width, height = int(pos[2][0] - pos[0][0]), int(pos[2][1] - pos[0][1])
+                    width, height = round(pos[2][0] - pos[0][0]), round(pos[2][1] - pos[0][1])
                     if width <= 0 or height <= 0:
                         logger.error(f'ocr result negative box {text} {confidence} {width}x{height} pos:{pos}')
                         continue
                     if confidence >= threshold:
-                        detected_box = Box(int(pos[0][0]), int(pos[0][1]), int(pos[2][0] - pos[0][0]),
-                                           int(pos[2][1] - pos[0][1]),
+                        detected_box = Box(pos[0][0], pos[0][1], width,
+                                           height,
                                            confidence, text)
                         scale_box(detected_box, scale_factor)
                         if box is not None:

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

@@ -70,27 +70,10 @@ REM Check all PIDs every second and terminate them after 10 seconds if still run
 set "check_duration=10"
 
 for %%A in (%pid_list%) do (
-    set "elapsed_time=0"
-    :check_loop
-    echo %time% - Waiting for PID %%A to exit...
-    tasklist /fi "PID eq %%A" | find ":" >nul
-    if errorlevel 1 (
-        echo %time% - PID %%A has exited.
-        goto next_pid
-    ) else (
-        timeout /t 1 /nobreak >nul
-        set /a elapsed_time+=1
-        if !elapsed_time! geq %check_duration% (
-            echo %time% - PID %%A is still running after %check_duration% seconds, killing it...
-            taskkill /f /pid %%A
-            goto next_pid
-        )
-        goto check_loop
-    )
-    :next_pid
-    echo %time% - continue
+    call :check_pid %%A
 )
 
+
 REM Sleep for one second
 timeout /t 1 /nobreak >nul
 
@@ -114,6 +97,29 @@ for /D %%D in ("%source_dir%\*") do (
 echo %time% Update Success
 start "" %exe%
 endlocal
+pause
+
+goto :eof
+
+:check_pid
+set "elapsed_time=0"
+:check_loop
+echo %time% - Waiting for PID %1 to exit...
+tasklist /fi "PID eq %1" | find ":" >nul
+if errorlevel 1 (
+    echo %time% - PID %1 has exited.
+    goto :eof
+) else (
+    timeout /t 1 /nobreak >nul
+    set /a elapsed_time+=1
+    if !elapsed_time! geq %check_duration% (
+        echo %time% - PID %1 is still running after %check_duration% seconds, killing it...
+        taskkill /f /pid %1
+        goto :eof
+    )
+    goto check_loop
+)
+goto :eof
 '''
 
 
@@ -287,17 +293,23 @@ class Updater:
         return True
 
     def update(self):
+        ok.gui.device_manager.adb_kill_server()
         exe_folder = get_path_relative_to_exe()
         batch_command = [self.to_update.get("updater_bat"), self.to_update.get("update_package_folder"), exe_folder,
-                         os.path.join(exe_folder, self.exe_name), os.path.join(exe_folder, 'md5.txt'), str(os.getpid())]
-        for proc in psutil.process_iter(['pid', 'name']):
-            if proc.info['name'] == 'adb.exe':
+                         os.path.join(exe_folder, self.exe_name), str(os.getpid())]
+        for proc in psutil.process_iter(['pid', 'name', 'exe']):
+            if proc.info['name'] == 'adb.exe' and os.path.normpath(proc.info['exe']).startswith(
+                    os.path.normpath(exe_folder)):
+                try:
+                    logger.info(f'try kill the adb process {proc.info}')
+                    proc.kill()
+                except Exception as e:
+                    logger.error(f'kill process error', e)
                 batch_command.append(str(proc.info['pid']))
 
         logger.info(f'execute update {batch_command}')
 
         subprocess.Popen(batch_command, creationflags=subprocess.CREATE_NEW_CONSOLE)
-        ok.gui.device_manager.adb_kill_server()
         ok.gui.ok.quit()
 
     def check_package_error(self):

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

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

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

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