fix(updater): import package

Signed-off-by: Me0wo <152751263+Sn0wo2@users.noreply.github.com>

Author: Sn0wo2

Updater/__init__.py

@@ -3,7 +3,7 @@
 
 import yaml
 
-from Updater.config.model import Config
+from .model import Config
 
 
 @lru_cache()

Updater/config/yml_loader.py

@@ -1,10 +1,10 @@
 from typing import Optional, MutableMapping
 
 import requests
+from proxy.http import get_proxies
 
 
 def fetch_latest_release(owner: str, repo: str, proxies: Optional[MutableMapping[str, str]] = None) -> dict:
-    from Updater.proxy.http import get_proxies
     proxies = proxies or get_proxies()
 
     resp = requests.get(

Updater/fetch/github_release_api.py

@@ -1,15 +1,24 @@
+import os
+import sys
+
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+if BASE_DIR not in sys.path:
+    sys.path.insert(0, BASE_DIR)
+
 import json
 import time
 from pathlib import Path
 
-from Updater.config.yml_loader import get_config
-from Updater.updater.assets.name import get_package_name_from_current_machine
-from Updater.updater.downloader.temp import download_to_temp
-from Updater.updater.extract.extract import extract_and_replace
-from Updater.updater.runner.process import find_processes_by_path, try_terminate
-from Updater.updater.tag.reader import read
+from psutil import NoSuchProcess
+
+from config.yml_loader import get_config
 from fetch.github_release_api import fetch_latest_release
 from proxy.http import get_proxies
+from updater.assets.name import get_package_name_from_current_machine
+from updater.downloader.temp import download_to_temp
+from updater.extract.extract import extract_and_replace
+from updater.runner.process import find_processes_by_path, try_terminate
+from updater.tag.reader import read
 
 OWNER = "Sn0wo2"
 REPO = "QuickNote"
@@ -32,7 +41,12 @@ def main():
         if not procs:
             print("No matching processes found.")
         for proc in procs:
-            try_terminate(proc)
+            try:
+                if proc.is_running():
+                    try_terminate(proc)
+            # fiber prefork child process
+            except (NoSuchProcess, PermissionError):
+                pass
 
         download_url = None
 

Updater/main.py

@@ -1,6 +1,6 @@
 from functools import lru_cache
 
-from Updater.config.yml_loader import get_config
+from config.yml_loader import get_config
 
 
 @lru_cache()

Updater/proxy/http.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
-from Updater.updater.extract.tar_gz import _extract_tar
-from Updater.updater.extract.zip import _extract_zip
+from .tar_gz import _extract_tar
+from .zip import _extract_zip
 
 
 def extract_and_replace(archive_path: Path, extract_to: Path):

Updater/updater/extract/extract.py

@@ -1,11 +1,13 @@
 import os
 import signal
+from pathlib import Path
+from typing import List
 
 import psutil
 
 
-def find_processes_by_path(target_path):
-    matches = []
+def find_processes_by_path(target_path: Path) -> list[psutil.Process]:
+    matches: List[psutil.Process] = []
     for proc in psutil.process_iter(['pid', 'exe', 'cmdline']):
         try:
             exe = proc.info['exe']
@@ -22,7 +24,7 @@ def try_terminate(proc):
     print(f"Trying to gracefully terminate PID {proc.pid} ({proc.name()})...")
     try:
         if os.name == 'nt':
-            os.kill(proc.pid, signal.CTRL_BREAK_EVENT)
+            proc.terminate()
         else:
             proc.send_signal(signal.SIGINT)
         proc.wait(timeout=5)

Updater/updater/runner/process.py

@@ -1,4 +1,4 @@
-from Updater.config.yml_loader import get_config
+from config.yml_loader import get_config
 
 
 def read():

Updater/updater/tag/reader.py

@@ -1,4 +1,4 @@
-from Updater.config.yml_loader import get_config
+from config.yml_loader import get_config
 
 
 def write(tag: str):