From cd63bbdda40c5e9adb3e5130a6eca1cbe97a9ffe Mon Sep 17 00:00:00 2001 From: Horror Proton <107091537+horror-proton@users.noreply.github.com> Date: Sun, 5 Mar 2023 19:24:44 +0800 Subject: [PATCH] feat: add fallback for python library search, etc. --- src/Python/asst/asst.py | 9 ++++++++- src/Python/sample.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Python/asst/asst.py b/src/Python/asst/asst.py index 879a2b55d5..2cc4f46f63 100644 --- a/src/Python/asst/asst.py +++ b/src/Python/asst/asst.py @@ -1,4 +1,5 @@ import ctypes +import ctypes.util import json import os import pathlib @@ -65,7 +66,13 @@ class Asst: os.environ[platform_values[platform_type]['environ_var']] += os.pathsep + str(path) except KeyError: os.environ[platform_values[platform_type]['environ_var']] = os.pathsep + str(path) - Asst.__lib = lib_import_func(str(Asst.__libpath)) + + try: + Asst.__lib = lib_import_func(str(Asst.__libpath)) + except OSError: + Asst.__libpath = ctypes.util.find_library('MaaCore') + Asst.__lib = lib_import_func(str(Asst.__libpath)) + Asst.__set_lib_properties() ret: bool = True diff --git a/src/Python/sample.py b/src/Python/sample.py index 3fb4257bb8..af4ae0ad1f 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -19,7 +19,7 @@ def my_callback(msg, details, arg): if __name__ == "__main__": # 请设置为存放 dll 文件及资源的路径 - path = pathlib.Path.cwd().parent + path = pathlib.Path(__file__).parent.parent # 设置更新器的路径和目标版本并更新 Updater(path, Version.Stable).update()