ok-script 0.0.199__tar.gz → 0.0.201__tar.gz

{ok-script-0.0.199/ok_script.egg-info → ok-script-0.0.201}/PKG-INFO

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

{ok-script-0.0.199 → ok-script-0.0.201}/ok/gui/App.py

@@ -38,7 +38,7 @@ class App:
         self.overlay = self.config.get('debug')
         if self.config.get('git_update'):
             self.updater = GitUpdater(self.config, exit_event)
-            self.updater.update_launcher()
+            
         logger.debug(f'locale name {self.locale.name()}')
 
         self.loading_window = None

{ok-script-0.0.199 → ok-script-0.0.201}/ok/gui/MainWindow.py

@@ -100,6 +100,7 @@ class MainWindow(MSFluentWindow):
     def showEvent(self, event):
         if event.type() == QEvent.Show:
             logger.info("Window has fully displayed")
+            ok.gui.app.updater.update_launcher()
         super().showEvent(event)
 
     def starting_emulator(self, done, error, seconds_left):

{ok-script-0.0.199 → ok-script-0.0.201}/ok/update/GitUpdater.py

@@ -8,13 +8,11 @@ import re
 import shutil
 import subprocess
 import sys
-import time
 from functools import cmp_to_key
 
 import git
 import psutil
 from PySide6.QtCore import QCoreApplication
-from PySide6.QtWidgets import QApplication
 
 from ok.config.Config import Config
 from ok.gui.Communicate import communicate
@@ -63,32 +61,34 @@ class GitUpdater:
         return self.launcher_config.get('app_version')
 
     def update_launcher(self):
+        self.handler.post(self.do_update_launcher, 5)
+
+    def do_update_launcher(self):
+        logger.info(f'do_update_launcher')
+        self.set_start_success()
+        self.kill_launcher()
         if self.app_config.get('version') != self.launcher_config.get('launcher_version'):
             logger.info(
                 f'need to update launcher version {self.launcher_config.get("launcher_version")} to {self.app_config.get("version")} ')
-            self.handler.post(self.do_update_launcher, 5)
+            if self.install_dependencies('launcher_env'):
+                logger.debug('update launcher_env dependencies success')
+                self.launcher_config['launcher_version'] = self.app_config.get('version')
 
-    def do_update_launcher(self):
+            copy_exe_files(os.path.join('repo', self.launcher_config['launcher_version']), os.getcwd())
+            clean_repo('repo', [self.app_config.get("version")])
+
+    def kill_launcher(self):
         # Create the parser
         parser = argparse.ArgumentParser(description='Process some parameters.')
-
         # Add the arguments
         parser.add_argument('--parent_pid', type=int, help='Parent process ID')
-
         # Parse the arguments
         args = parser.parse_args()
-
         logger.info(f'parent_pid {args.parent_pid}')
         if args.parent_pid:
-            wait_for_pid(args.parent_pid)
+            wait_kill_pid(args.parent_pid)
         python_folder = os.path.abspath(os.path.join('python', 'launcher_env'))
         kill_process_by_path(python_folder)
-        if self.install_dependencies('launcher_env'):
-            logger.debug('update launcher_env dependencies success')
-            self.launcher_config['launcher_version'] = self.app_config.get('version')
-
-        copy_exe_files(os.path.join('repo', self.launcher_config['launcher_version']), os.getcwd())
-        clean_repo('repo', [self.app_config.get("version")])
 
     def load_current_ver(self):
         path = os.path.join('repo', self.version)
@@ -97,13 +97,6 @@ class GitUpdater:
     def log_handler(self, level, message):
         communicate.log.emit(level, message)
 
-    def handle_log(self, level, message):
-        if 'Window has fully displayed' in message:
-            logger.info(f'start success, exit launcher')
-            self.set_start_success()
-            self.exit_event.set()
-            QApplication.quit()
-
     def get_current_profile(self):
         return next((obj for obj in self.launch_profiles if obj['name'] == self.launcher_config.get('profile_name')),
                     None)
@@ -121,7 +114,6 @@ class GitUpdater:
                 return
 
             if not self.log_tailer:
-                communicate.log.connect(self.handle_log)
                 self.log_tailer = LogTailer(os.path.join('logs', 'ok-script.log'), self.exit_event, self.log_handler)
                 self.log_tailer.start()
                 logger.info('start log tailer')
@@ -474,12 +466,11 @@ def get_version_text(lts, version, date, logs):
         return text
 
 
-def wait_for_pid(pid):
-    while True:
-        if not psutil.pid_exists(pid):
-            logger.info(f'Process {pid} has exited.')
-            break
-        time.sleep(1)
+def wait_kill_pid(pid):
+    process = psutil.Process(pid)
+    process.terminate()
+    process.wait(timeout=30)
+    logger.info(f'kill process {pid} exists {psutil.pid_exists(pid)}')
 
 
 def kill_process_by_path(exe_path):

{ok-script-0.0.199 → ok-script-0.0.201/ok_script.egg-info}/PKG-INFO

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

{ok-script-0.0.199 → ok-script-0.0.201}/setup.py

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