Skip to content

Commit f20cf57

Browse files
committed
ci: fix
1 parent bdc3618 commit f20cf57

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
- name: Install dep
160160
run: |
161161
pacman -Sy
162-
pacman -S --noconfirm cmake python ccache ninja git
162+
pacman -S --noconfirm cmake python python-pip ccache ninja git
163163
164164
# https://github.com/MaaAssistantArknights/MaaFramework/actions/runs/5643408179/job/15285186255
165165
- uses: actions/checkout@v3

source/binding/Python/maa/library.py

+5-24
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,12 @@ def open(
2121
"""
2222

2323
platform_values = {
24-
"windows": {
25-
"framework_libpath": "MaaFramework.dll",
26-
"toolkit_libpath": "MaaToolkit.dll",
27-
"environ_var": "PATH",
28-
},
29-
"darwin": {
30-
"framework_libpath": "libMaaFramework.dylib",
31-
"toolkit_libpath": "libMaaToolkit.dylib",
32-
"environ_var": "DYLD_LIBRARY_PATH",
33-
},
34-
"linux": {
35-
"framework_libpath": "libMaaFramework.so",
36-
"toolkit_libpath": "libMaaToolkit.so",
37-
"environ_var": "LD_LIBRARY_PATH",
38-
},
24+
"windows": ("MaaFramework.dll", "MaaToolkit.dll"),
25+
"darwin": ("libMaaFramework.dylib", "libMaaToolkit.dylib"),
26+
"linux": ("libMaaFramework.so", "libMaaToolkit.so"),
3927
}
4028

4129
platform_type = platform.system().lower()
42-
environ_var = platform_values[platform_type]["environ_var"]
43-
environ = os.environ[environ_var]
44-
try:
45-
environ += os.pathsep + str(path)
46-
except KeyError:
47-
environ = str(path)
4830

4931
if platform_type == "windows":
5032
lib_import = ctypes.WinDLL
@@ -53,7 +35,7 @@ def open(
5335

5436
try:
5537
cls.framework_libpath = (
56-
pathlib.Path(path) / platform_values[platform_type]["framework_libpath"]
38+
pathlib.Path(path) / platform_values[platform_type][0]
5739
)
5840
cls.framework = lib_import(str(cls.framework_libpath))
5941
except OSError:
@@ -67,8 +49,7 @@ def open(
6749
if toolkit:
6850
try:
6951
cls.toolkit_libpath = (
70-
pathlib.Path(path)
71-
/ platform_values[platform_type]["toolkit_libpath"]
52+
pathlib.Path(path) / platform_values[platform_type][1]
7253
)
7354
cls.toolkit = lib_import(str(cls.toolkit_libpath))
7455
except OSError:

0 commit comments

Comments
 (0)