ok-script 0.0.413__tar.gz → 0.0.415__tar.gz

{ok_script-0.0.413/ok_script.egg-info → ok_script-0.0.415}/PKG-INFO

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

{ok_script-0.0.413 → ok_script-0.0.415}/ok/update/GitUpdater.py

@@ -70,23 +70,22 @@ class GitUpdater:
         self.handler.post(self.do_update_success, 1)
 
     def do_update_success(self):
-        logger.info(f'do_update_launcher start {self.cleaned}')
-        if self.cleaned:
-            return
-        self.set_start_success()
-        self.kill_launcher()
-        current_version = self.app_config.get('version')
-        for item in os.listdir('repo'):
-            item_path = os.path.join('repo', item)
-            if os.path.isdir(item_path) and item != current_version:
-                logger.info(f"Deleting: {item_path}")
-                kill_exe(item_path)
-                try:
-                    # take_ownership(os.path.join(item_path))
-                    cmd = ["cmd", "/c", "rd", "/s", "/q", item_path]
-                    subprocess.run(cmd, check=True)
-                except Exception as e:
-                    logger.error(f"Error deleting '{item_path}'", e)
+        logger.info(f'do_update_launcher start')
+        if self.set_start_success():
+            self.kill_launcher()
+            current_version = self.app_config.get('version')
+            for item in os.listdir('repo'):
+                item_path = os.path.join('repo', item)
+                if os.path.isdir(item_path) and item != current_version:
+                    logger.info(f"Deleting: {item_path}")
+                    kill_exe(item_path)
+                    try:
+                        # take_ownership(os.path.join(item_path))
+                        cmd = ["cmd", "/c", "rd", "/s", "/q", item_path]
+                        subprocess.run(cmd, check=True)
+                    except Exception as e:
+                        logger.error(f"Error deleting '{item_path}'", e)
+            copy_exe_files(os.path.join('repo', current_version), os.getcwd())
         self.list_all_versions()
 
     def kill_launcher(self):
@@ -314,9 +313,10 @@ class GitUpdater:
             communicate.update_running.emit(False, False)
 
     def set_start_success(self):
-        self.cleaned = True
-        self.launcher_config['app_version'] = self.app_config.get('version')
-        self.launcher_config['app_dependencies_installed'] = True
+        if self.launcher_config['app_version'] != self.app_config.get('version'):
+            self.launcher_config['app_version'] = self.app_config.get('version')
+            self.launcher_config['app_dependencies_installed'] = True
+            return True
 
     def check_out_version(self, version, depth=10):
         path = os.path.join('repo', version)

{ok_script-0.0.413 → ok_script-0.0.415/ok_script.egg-info}/PKG-INFO

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

{ok_script-0.0.413 → ok_script-0.0.415}/setup.py

@@ -59,7 +59,7 @@ extensions = [
 ]
 setuptools.setup(
     name="ok-script",
-    version="0.0.413",
+    version="0.0.415",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",