MaaFw 3.0.3__py3-none-win_amd64.whl → 4.0.0a1__py3-none-win_amd64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of MaaFw might be problematic. Click here for more details.
- maa/__init__.py +1 -1
- maa/agent/__init__.py +12 -0
- maa/agent/agent_server.py +132 -0
- maa/agent_client.py +83 -0
- maa/bin/MaaAdbControlUnit.dll +0 -0
- maa/bin/MaaAgentClient.dll +0 -0
- maa/bin/MaaAgentServer.dll +0 -0
- maa/bin/MaaDbgControlUnit.dll +0 -0
- maa/bin/MaaFramework.dll +0 -0
- maa/bin/MaaToolkit.dll +0 -0
- maa/bin/MaaUtils.dll +0 -0
- maa/bin/MaaWin32ControlUnit.dll +0 -0
- maa/bin/fastdeploy_ppocr_maa.dll +0 -0
- maa/bin/onnxruntime_maa.dll +0 -0
- maa/bin/opencv_world4_maa.dll +0 -0
- maa/buffer.py +129 -131
- maa/context.py +24 -24
- maa/controller.py +70 -70
- maa/define.py +5 -2
- maa/library.py +107 -15
- maa/resource.py +47 -47
- maa/tasker.py +63 -61
- maa/toolkit.py +82 -78
- {MaaFw-3.0.3.dist-info → maafw-4.0.0a1.dist-info}/METADATA +13 -3
- maafw-4.0.0a1.dist-info/RECORD +33 -0
- {MaaFw-3.0.3.dist-info → maafw-4.0.0a1.dist-info}/WHEEL +1 -1
- MaaFw-3.0.3.dist-info/RECORD +0 -28
- {MaaFw-3.0.3.dist-info → maafw-4.0.0a1.dist-info}/LICENSE.md +0 -0
- {MaaFw-3.0.3.dist-info → maafw-4.0.0a1.dist-info}/top_level.txt +0 -0
maa/resource.py
CHANGED
|
@@ -12,7 +12,7 @@ from .buffer import StringBuffer
|
|
|
12
12
|
class Resource:
|
|
13
13
|
_notification_handler: Optional[NotificationHandler]
|
|
14
14
|
_handle: MaaResourceHandle
|
|
15
|
-
_own: bool
|
|
15
|
+
_own: bool
|
|
16
16
|
|
|
17
17
|
### public ###
|
|
18
18
|
|
|
@@ -28,7 +28,7 @@ class Resource:
|
|
|
28
28
|
self._own = False
|
|
29
29
|
else:
|
|
30
30
|
self._notification_handler = notification_handler
|
|
31
|
-
self._handle = Library.framework.MaaResourceCreate(
|
|
31
|
+
self._handle = Library.framework().MaaResourceCreate(
|
|
32
32
|
*NotificationHandler._gen_c_param(self._notification_handler)
|
|
33
33
|
)
|
|
34
34
|
self._own = True
|
|
@@ -41,20 +41,20 @@ class Resource:
|
|
|
41
41
|
|
|
42
42
|
def __del__(self):
|
|
43
43
|
if self._handle and self._own:
|
|
44
|
-
Library.framework.MaaResourceDestroy(self._handle)
|
|
44
|
+
Library.framework().MaaResourceDestroy(self._handle)
|
|
45
45
|
|
|
46
46
|
def post_bundle(self, path: Union[pathlib.Path, str]) -> Job:
|
|
47
|
-
resid = Library.framework.MaaResourcePostBundle(
|
|
47
|
+
resid = Library.framework().MaaResourcePostBundle(
|
|
48
48
|
self._handle, str(path).encode()
|
|
49
49
|
)
|
|
50
50
|
return Job(resid, self._status, self._wait)
|
|
51
51
|
|
|
52
52
|
@property
|
|
53
53
|
def loaded(self) -> bool:
|
|
54
|
-
return bool(Library.framework.MaaResourceLoaded(self._handle))
|
|
54
|
+
return bool(Library.framework().MaaResourceLoaded(self._handle))
|
|
55
55
|
|
|
56
56
|
def clear(self) -> bool:
|
|
57
|
-
return bool(Library.framework.MaaResourceClear(self._handle))
|
|
57
|
+
return bool(Library.framework().MaaResourceClear(self._handle))
|
|
58
58
|
|
|
59
59
|
def use_cpu(self) -> bool:
|
|
60
60
|
return self.set_inference(
|
|
@@ -112,7 +112,7 @@ class Resource:
|
|
|
112
112
|
self._custom_recognition_holder[name] = recognition
|
|
113
113
|
|
|
114
114
|
return bool(
|
|
115
|
-
Library.framework.MaaResourceRegisterCustomRecognition(
|
|
115
|
+
Library.framework().MaaResourceRegisterCustomRecognition(
|
|
116
116
|
self._handle,
|
|
117
117
|
name.encode(),
|
|
118
118
|
recognition.c_handle,
|
|
@@ -124,7 +124,7 @@ class Resource:
|
|
|
124
124
|
self._custom_recognition_holder.pop(name, None)
|
|
125
125
|
|
|
126
126
|
return bool(
|
|
127
|
-
Library.framework.MaaResourceUnregisterCustomRecognition(
|
|
127
|
+
Library.framework().MaaResourceUnregisterCustomRecognition(
|
|
128
128
|
self._handle,
|
|
129
129
|
name.encode(),
|
|
130
130
|
)
|
|
@@ -134,7 +134,7 @@ class Resource:
|
|
|
134
134
|
self._custom_recognition_holder.clear()
|
|
135
135
|
|
|
136
136
|
return bool(
|
|
137
|
-
Library.framework.MaaResourceClearCustomRecognition(
|
|
137
|
+
Library.framework().MaaResourceClearCustomRecognition(
|
|
138
138
|
self._handle,
|
|
139
139
|
)
|
|
140
140
|
)
|
|
@@ -152,7 +152,7 @@ class Resource:
|
|
|
152
152
|
self._custom_action_holder[name] = action
|
|
153
153
|
|
|
154
154
|
return bool(
|
|
155
|
-
Library.framework.MaaResourceRegisterCustomAction(
|
|
155
|
+
Library.framework().MaaResourceRegisterCustomAction(
|
|
156
156
|
self._handle,
|
|
157
157
|
name.encode(),
|
|
158
158
|
action.c_handle,
|
|
@@ -164,7 +164,7 @@ class Resource:
|
|
|
164
164
|
self._custom_action_holder.pop(name, None)
|
|
165
165
|
|
|
166
166
|
return bool(
|
|
167
|
-
Library.framework.MaaResourceUnregisterCustomAction(
|
|
167
|
+
Library.framework().MaaResourceUnregisterCustomAction(
|
|
168
168
|
self._handle,
|
|
169
169
|
name.encode(),
|
|
170
170
|
)
|
|
@@ -174,7 +174,7 @@ class Resource:
|
|
|
174
174
|
self._custom_action_holder.clear()
|
|
175
175
|
|
|
176
176
|
return bool(
|
|
177
|
-
Library.framework.MaaResourceClearCustomAction(
|
|
177
|
+
Library.framework().MaaResourceClearCustomAction(
|
|
178
178
|
self._handle,
|
|
179
179
|
)
|
|
180
180
|
)
|
|
@@ -182,7 +182,7 @@ class Resource:
|
|
|
182
182
|
@property
|
|
183
183
|
def hash(self) -> str:
|
|
184
184
|
buffer = StringBuffer()
|
|
185
|
-
if not Library.framework.MaaResourceGetHash(self._handle, buffer._handle):
|
|
185
|
+
if not Library.framework().MaaResourceGetHash(self._handle, buffer._handle):
|
|
186
186
|
raise RuntimeError("Failed to get hash.")
|
|
187
187
|
return buffer.get()
|
|
188
188
|
|
|
@@ -192,14 +192,14 @@ class Resource:
|
|
|
192
192
|
cep = ctypes.c_int32(execution_provider)
|
|
193
193
|
cdevice = ctypes.c_int32(device_id)
|
|
194
194
|
return bool(
|
|
195
|
-
Library.framework.MaaResourceSetOption(
|
|
195
|
+
Library.framework().MaaResourceSetOption(
|
|
196
196
|
self._handle,
|
|
197
197
|
MaaResOptionEnum.InferenceExecutionProvider,
|
|
198
198
|
ctypes.pointer(cep),
|
|
199
199
|
ctypes.sizeof(ctypes.c_int32),
|
|
200
200
|
)
|
|
201
201
|
) and bool(
|
|
202
|
-
Library.framework.MaaResourceSetOption(
|
|
202
|
+
Library.framework().MaaResourceSetOption(
|
|
203
203
|
self._handle,
|
|
204
204
|
MaaResOptionEnum.InferenceDevice,
|
|
205
205
|
ctypes.pointer(cdevice),
|
|
@@ -208,10 +208,10 @@ class Resource:
|
|
|
208
208
|
)
|
|
209
209
|
|
|
210
210
|
def _status(self, id: int) -> ctypes.c_int32:
|
|
211
|
-
return Library.framework.MaaResourceStatus(self._handle, id)
|
|
211
|
+
return Library.framework().MaaResourceStatus(self._handle, id)
|
|
212
212
|
|
|
213
213
|
def _wait(self, id: int) -> ctypes.c_int32:
|
|
214
|
-
return Library.framework.MaaResourceWait(self._handle, id)
|
|
214
|
+
return Library.framework().MaaResourceWait(self._handle, id)
|
|
215
215
|
|
|
216
216
|
_api_properties_initialized: bool = False
|
|
217
217
|
|
|
@@ -221,87 +221,87 @@ class Resource:
|
|
|
221
221
|
return
|
|
222
222
|
Resource._api_properties_initialized = True
|
|
223
223
|
|
|
224
|
-
Library.framework.MaaResourceCreate.restype = MaaResourceHandle
|
|
225
|
-
Library.framework.MaaResourceCreate.argtypes = [
|
|
224
|
+
Library.framework().MaaResourceCreate.restype = MaaResourceHandle
|
|
225
|
+
Library.framework().MaaResourceCreate.argtypes = [
|
|
226
226
|
MaaNotificationCallback,
|
|
227
227
|
ctypes.c_void_p,
|
|
228
228
|
]
|
|
229
229
|
|
|
230
|
-
Library.framework.MaaResourceDestroy.restype = None
|
|
231
|
-
Library.framework.MaaResourceDestroy.argtypes = [MaaResourceHandle]
|
|
230
|
+
Library.framework().MaaResourceDestroy.restype = None
|
|
231
|
+
Library.framework().MaaResourceDestroy.argtypes = [MaaResourceHandle]
|
|
232
232
|
|
|
233
|
-
Library.framework.MaaResourcePostBundle.restype = MaaResId
|
|
234
|
-
Library.framework.MaaResourcePostBundle.argtypes = [
|
|
233
|
+
Library.framework().MaaResourcePostBundle.restype = MaaResId
|
|
234
|
+
Library.framework().MaaResourcePostBundle.argtypes = [
|
|
235
235
|
MaaResourceHandle,
|
|
236
236
|
ctypes.c_char_p,
|
|
237
237
|
]
|
|
238
238
|
|
|
239
|
-
Library.framework.MaaResourceStatus.restype = MaaStatus
|
|
240
|
-
Library.framework.MaaResourceStatus.argtypes = [
|
|
239
|
+
Library.framework().MaaResourceStatus.restype = MaaStatus
|
|
240
|
+
Library.framework().MaaResourceStatus.argtypes = [
|
|
241
241
|
MaaResourceHandle,
|
|
242
242
|
MaaResId,
|
|
243
243
|
]
|
|
244
244
|
|
|
245
|
-
Library.framework.MaaResourceWait.restype = MaaStatus
|
|
246
|
-
Library.framework.MaaResourceWait.argtypes = [
|
|
245
|
+
Library.framework().MaaResourceWait.restype = MaaStatus
|
|
246
|
+
Library.framework().MaaResourceWait.argtypes = [
|
|
247
247
|
MaaResourceHandle,
|
|
248
248
|
MaaResId,
|
|
249
249
|
]
|
|
250
250
|
|
|
251
|
-
Library.framework.MaaResourceLoaded.restype = MaaBool
|
|
252
|
-
Library.framework.MaaResourceLoaded.argtypes = [MaaResourceHandle]
|
|
251
|
+
Library.framework().MaaResourceLoaded.restype = MaaBool
|
|
252
|
+
Library.framework().MaaResourceLoaded.argtypes = [MaaResourceHandle]
|
|
253
253
|
|
|
254
|
-
Library.framework.MaaResourceClear.restype = MaaBool
|
|
255
|
-
Library.framework.MaaResourceClear.argtypes = [MaaResourceHandle]
|
|
254
|
+
Library.framework().MaaResourceClear.restype = MaaBool
|
|
255
|
+
Library.framework().MaaResourceClear.argtypes = [MaaResourceHandle]
|
|
256
256
|
|
|
257
|
-
Library.framework.MaaResourceGetHash.restype = MaaBool
|
|
258
|
-
Library.framework.MaaResourceGetHash.argtypes = [
|
|
257
|
+
Library.framework().MaaResourceGetHash.restype = MaaBool
|
|
258
|
+
Library.framework().MaaResourceGetHash.argtypes = [
|
|
259
259
|
MaaResourceHandle,
|
|
260
260
|
MaaStringBufferHandle,
|
|
261
261
|
]
|
|
262
262
|
|
|
263
|
-
Library.framework.MaaResourceSetOption.restype = MaaBool
|
|
264
|
-
Library.framework.MaaResourceSetOption.argtypes = [
|
|
263
|
+
Library.framework().MaaResourceSetOption.restype = MaaBool
|
|
264
|
+
Library.framework().MaaResourceSetOption.argtypes = [
|
|
265
265
|
MaaResourceHandle,
|
|
266
266
|
MaaResOption,
|
|
267
267
|
MaaOptionValue,
|
|
268
268
|
MaaOptionValueSize,
|
|
269
269
|
]
|
|
270
270
|
|
|
271
|
-
Library.framework.MaaResourceRegisterCustomRecognition.restype = MaaBool
|
|
272
|
-
Library.framework.MaaResourceRegisterCustomRecognition.argtypes = [
|
|
271
|
+
Library.framework().MaaResourceRegisterCustomRecognition.restype = MaaBool
|
|
272
|
+
Library.framework().MaaResourceRegisterCustomRecognition.argtypes = [
|
|
273
273
|
MaaResourceHandle,
|
|
274
274
|
ctypes.c_char_p,
|
|
275
275
|
MaaCustomRecognitionCallback,
|
|
276
276
|
ctypes.c_void_p,
|
|
277
277
|
]
|
|
278
278
|
|
|
279
|
-
Library.framework.MaaResourceUnregisterCustomRecognition.restype = MaaBool
|
|
280
|
-
Library.framework.MaaResourceUnregisterCustomRecognition.argtypes = [
|
|
279
|
+
Library.framework().MaaResourceUnregisterCustomRecognition.restype = MaaBool
|
|
280
|
+
Library.framework().MaaResourceUnregisterCustomRecognition.argtypes = [
|
|
281
281
|
MaaResourceHandle,
|
|
282
282
|
ctypes.c_char_p,
|
|
283
283
|
]
|
|
284
284
|
|
|
285
|
-
Library.framework.MaaResourceClearCustomRecognition.restype = MaaBool
|
|
286
|
-
Library.framework.MaaResourceClearCustomRecognition.argtypes = [
|
|
285
|
+
Library.framework().MaaResourceClearCustomRecognition.restype = MaaBool
|
|
286
|
+
Library.framework().MaaResourceClearCustomRecognition.argtypes = [
|
|
287
287
|
MaaResourceHandle,
|
|
288
288
|
]
|
|
289
289
|
|
|
290
|
-
Library.framework.MaaResourceRegisterCustomAction.restype = MaaBool
|
|
291
|
-
Library.framework.MaaResourceRegisterCustomAction.argtypes = [
|
|
290
|
+
Library.framework().MaaResourceRegisterCustomAction.restype = MaaBool
|
|
291
|
+
Library.framework().MaaResourceRegisterCustomAction.argtypes = [
|
|
292
292
|
MaaResourceHandle,
|
|
293
293
|
ctypes.c_char_p,
|
|
294
294
|
MaaCustomActionCallback,
|
|
295
295
|
ctypes.c_void_p,
|
|
296
296
|
]
|
|
297
297
|
|
|
298
|
-
Library.framework.MaaResourceUnregisterCustomAction.restype = MaaBool
|
|
299
|
-
Library.framework.MaaResourceUnregisterCustomAction.argtypes = [
|
|
298
|
+
Library.framework().MaaResourceUnregisterCustomAction.restype = MaaBool
|
|
299
|
+
Library.framework().MaaResourceUnregisterCustomAction.argtypes = [
|
|
300
300
|
MaaResourceHandle,
|
|
301
301
|
ctypes.c_char_p,
|
|
302
302
|
]
|
|
303
303
|
|
|
304
|
-
Library.framework.MaaResourceClearCustomAction.restype = MaaBool
|
|
305
|
-
Library.framework.MaaResourceClearCustomAction.argtypes = [
|
|
304
|
+
Library.framework().MaaResourceClearCustomAction.restype = MaaBool
|
|
305
|
+
Library.framework().MaaResourceClearCustomAction.argtypes = [
|
|
306
306
|
MaaResourceHandle,
|
|
307
307
|
]
|
maa/tasker.py
CHANGED
|
@@ -15,7 +15,7 @@ from .controller import Controller
|
|
|
15
15
|
class Tasker:
|
|
16
16
|
_notification_handler: Optional[NotificationHandler]
|
|
17
17
|
_handle: MaaTaskerHandle
|
|
18
|
-
_own: bool
|
|
18
|
+
_own: bool
|
|
19
19
|
|
|
20
20
|
### public ###
|
|
21
21
|
|
|
@@ -31,7 +31,7 @@ class Tasker:
|
|
|
31
31
|
self._own = False
|
|
32
32
|
else:
|
|
33
33
|
self._notification_handler = notification_handler
|
|
34
|
-
self._handle = Library.framework.MaaTaskerCreate(
|
|
34
|
+
self._handle = Library.framework().MaaTaskerCreate(
|
|
35
35
|
*NotificationHandler._gen_c_param(self._notification_handler)
|
|
36
36
|
)
|
|
37
37
|
self._own = True
|
|
@@ -41,7 +41,7 @@ class Tasker:
|
|
|
41
41
|
|
|
42
42
|
def __del__(self):
|
|
43
43
|
if self._handle and self._own:
|
|
44
|
-
Library.framework.MaaTaskerDestroy(self._handle)
|
|
44
|
+
Library.framework().MaaTaskerDestroy(self._handle)
|
|
45
45
|
|
|
46
46
|
def bind(self, resource: Resource, controller: Controller) -> bool:
|
|
47
47
|
# avoid gc
|
|
@@ -49,14 +49,16 @@ class Tasker:
|
|
|
49
49
|
self._controller_holder = controller
|
|
50
50
|
|
|
51
51
|
return bool(
|
|
52
|
-
Library.framework.MaaTaskerBindResource(self._handle, resource._handle)
|
|
52
|
+
Library.framework().MaaTaskerBindResource(self._handle, resource._handle)
|
|
53
53
|
) and bool(
|
|
54
|
-
Library.framework.MaaTaskerBindController(
|
|
54
|
+
Library.framework().MaaTaskerBindController(
|
|
55
|
+
self._handle, controller._handle
|
|
56
|
+
)
|
|
55
57
|
)
|
|
56
58
|
|
|
57
59
|
@property
|
|
58
60
|
def resource(self) -> Resource:
|
|
59
|
-
resource_handle = Library.framework.MaaTaskerGetResource(self._handle)
|
|
61
|
+
resource_handle = Library.framework().MaaTaskerGetResource(self._handle)
|
|
60
62
|
if not resource_handle:
|
|
61
63
|
raise RuntimeError("Failed to get resource.")
|
|
62
64
|
|
|
@@ -64,7 +66,7 @@ class Tasker:
|
|
|
64
66
|
|
|
65
67
|
@property
|
|
66
68
|
def controller(self) -> Controller:
|
|
67
|
-
controller_handle = Library.framework.MaaTaskerGetController(self._handle)
|
|
69
|
+
controller_handle = Library.framework().MaaTaskerGetController(self._handle)
|
|
68
70
|
if not controller_handle:
|
|
69
71
|
raise RuntimeError("Failed to get controller.")
|
|
70
72
|
|
|
@@ -72,10 +74,10 @@ class Tasker:
|
|
|
72
74
|
|
|
73
75
|
@property
|
|
74
76
|
def inited(self) -> bool:
|
|
75
|
-
return bool(Library.framework.MaaTaskerInited(self._handle))
|
|
77
|
+
return bool(Library.framework().MaaTaskerInited(self._handle))
|
|
76
78
|
|
|
77
79
|
def post_task(self, entry: str, pipeline_override: Dict = {}) -> JobWithResult:
|
|
78
|
-
taskid = Library.framework.MaaTaskerPostTask(
|
|
80
|
+
taskid = Library.framework().MaaTaskerPostTask(
|
|
79
81
|
self._handle,
|
|
80
82
|
*Tasker._gen_post_param(entry, pipeline_override),
|
|
81
83
|
)
|
|
@@ -83,16 +85,16 @@ class Tasker:
|
|
|
83
85
|
|
|
84
86
|
@property
|
|
85
87
|
def running(self) -> bool:
|
|
86
|
-
return bool(Library.framework.MaaTaskerRunning(self._handle))
|
|
88
|
+
return bool(Library.framework().MaaTaskerRunning(self._handle))
|
|
87
89
|
|
|
88
90
|
def post_stop(self) -> Job:
|
|
89
|
-
taskid = Library.framework.MaaTaskerPostStop(self._handle)
|
|
91
|
+
taskid = Library.framework().MaaTaskerPostStop(self._handle)
|
|
90
92
|
return self._gen_task_job(taskid)
|
|
91
93
|
|
|
92
94
|
def get_latest_node(self, name: str) -> Optional[NodeDetail]:
|
|
93
95
|
c_node_id = MaaNodeId()
|
|
94
96
|
ret = bool(
|
|
95
|
-
Library.framework.MaaTaskerGetLatestNode(
|
|
97
|
+
Library.framework().MaaTaskerGetLatestNode(
|
|
96
98
|
self._handle,
|
|
97
99
|
name.encode(),
|
|
98
100
|
ctypes.pointer(c_node_id),
|
|
@@ -104,13 +106,13 @@ class Tasker:
|
|
|
104
106
|
return self.get_node_detail(int(c_node_id.value))
|
|
105
107
|
|
|
106
108
|
def clear_cache(self) -> bool:
|
|
107
|
-
return bool(Library.framework.MaaTaskerClearCache(self._handle))
|
|
109
|
+
return bool(Library.framework().MaaTaskerClearCache(self._handle))
|
|
108
110
|
|
|
109
111
|
@staticmethod
|
|
110
112
|
def set_log_dir(path: Union[Path, str]) -> bool:
|
|
111
113
|
strpath = str(path)
|
|
112
114
|
return bool(
|
|
113
|
-
Library.framework.MaaSetGlobalOption(
|
|
115
|
+
Library.framework().MaaSetGlobalOption(
|
|
114
116
|
MaaOption(MaaGlobalOptionEnum.LogDir),
|
|
115
117
|
strpath.encode(),
|
|
116
118
|
len(strpath),
|
|
@@ -121,7 +123,7 @@ class Tasker:
|
|
|
121
123
|
def set_save_draw(save_draw: bool) -> bool:
|
|
122
124
|
cbool = ctypes.c_bool(save_draw)
|
|
123
125
|
return bool(
|
|
124
|
-
Library.framework.MaaSetGlobalOption(
|
|
126
|
+
Library.framework().MaaSetGlobalOption(
|
|
125
127
|
MaaOption(MaaGlobalOptionEnum.SaveDraw),
|
|
126
128
|
ctypes.pointer(cbool),
|
|
127
129
|
ctypes.sizeof(ctypes.c_bool),
|
|
@@ -132,7 +134,7 @@ class Tasker:
|
|
|
132
134
|
def set_recording(recording: bool) -> bool:
|
|
133
135
|
cbool = ctypes.c_bool(recording)
|
|
134
136
|
return bool(
|
|
135
|
-
Library.framework.MaaSetGlobalOption(
|
|
137
|
+
Library.framework().MaaSetGlobalOption(
|
|
136
138
|
MaaOption(MaaGlobalOptionEnum.Recording),
|
|
137
139
|
ctypes.pointer(cbool),
|
|
138
140
|
ctypes.sizeof(ctypes.c_bool),
|
|
@@ -143,7 +145,7 @@ class Tasker:
|
|
|
143
145
|
def set_stdout_level(level: LoggingLevelEnum) -> bool:
|
|
144
146
|
clevel = MaaLoggingLevel(level)
|
|
145
147
|
return bool(
|
|
146
|
-
Library.framework.MaaSetGlobalOption(
|
|
148
|
+
Library.framework().MaaSetGlobalOption(
|
|
147
149
|
MaaOption(MaaGlobalOptionEnum.StdoutLevel),
|
|
148
150
|
ctypes.pointer(clevel),
|
|
149
151
|
ctypes.sizeof(MaaLoggingLevel),
|
|
@@ -154,7 +156,7 @@ class Tasker:
|
|
|
154
156
|
def set_show_hit_draw(show_hit_draw: bool) -> bool:
|
|
155
157
|
cbool = ctypes.c_bool(show_hit_draw)
|
|
156
158
|
return bool(
|
|
157
|
-
Library.framework.MaaSetGlobalOption(
|
|
159
|
+
Library.framework().MaaSetGlobalOption(
|
|
158
160
|
MaaOption(MaaGlobalOptionEnum.ShowHitDraw),
|
|
159
161
|
ctypes.pointer(cbool),
|
|
160
162
|
ctypes.sizeof(ctypes.c_bool),
|
|
@@ -165,7 +167,7 @@ class Tasker:
|
|
|
165
167
|
def set_debug_mode(debug_mode: bool) -> bool:
|
|
166
168
|
cbool = ctypes.c_bool(debug_mode)
|
|
167
169
|
return bool(
|
|
168
|
-
Library.framework.MaaSetGlobalOption(
|
|
170
|
+
Library.framework().MaaSetGlobalOption(
|
|
169
171
|
MaaOption(MaaGlobalOptionEnum.DebugMode),
|
|
170
172
|
ctypes.pointer(cbool),
|
|
171
173
|
ctypes.sizeof(ctypes.c_bool),
|
|
@@ -190,10 +192,10 @@ class Tasker:
|
|
|
190
192
|
)
|
|
191
193
|
|
|
192
194
|
def _task_status(self, id: int) -> ctypes.c_int32:
|
|
193
|
-
return Library.framework.MaaTaskerStatus(self._handle, id)
|
|
195
|
+
return Library.framework().MaaTaskerStatus(self._handle, id)
|
|
194
196
|
|
|
195
197
|
def _task_wait(self, id: int) -> ctypes.c_int32:
|
|
196
|
-
return Library.framework.MaaTaskerWait(self._handle, id)
|
|
198
|
+
return Library.framework().MaaTaskerWait(self._handle, id)
|
|
197
199
|
|
|
198
200
|
def get_recognition_detail(self, reco_id: int) -> Optional[RecognitionDetail]:
|
|
199
201
|
name = StringBuffer()
|
|
@@ -204,7 +206,7 @@ class Tasker:
|
|
|
204
206
|
raw = ImageBuffer()
|
|
205
207
|
draws = ImageListBuffer()
|
|
206
208
|
ret = bool(
|
|
207
|
-
Library.framework.MaaTaskerGetRecognitionDetail(
|
|
209
|
+
Library.framework().MaaTaskerGetRecognitionDetail(
|
|
208
210
|
self._handle,
|
|
209
211
|
MaaRecoId(reco_id),
|
|
210
212
|
name._handle,
|
|
@@ -242,7 +244,7 @@ class Tasker:
|
|
|
242
244
|
c_completed = MaaBool()
|
|
243
245
|
|
|
244
246
|
ret = bool(
|
|
245
|
-
Library.framework.MaaTaskerGetNodeDetail(
|
|
247
|
+
Library.framework().MaaTaskerGetNodeDetail(
|
|
246
248
|
self._handle,
|
|
247
249
|
MaaNodeId(node_id),
|
|
248
250
|
name._handle,
|
|
@@ -270,7 +272,7 @@ class Tasker:
|
|
|
270
272
|
entry = StringBuffer()
|
|
271
273
|
status = MaaStatus()
|
|
272
274
|
ret = bool(
|
|
273
|
-
Library.framework.MaaTaskerGetTaskDetail(
|
|
275
|
+
Library.framework().MaaTaskerGetTaskDetail(
|
|
274
276
|
self._handle,
|
|
275
277
|
MaaTaskId(task_id),
|
|
276
278
|
entry._handle,
|
|
@@ -284,7 +286,7 @@ class Tasker:
|
|
|
284
286
|
|
|
285
287
|
c_node_id_list = (MaaNodeId * size.value)()
|
|
286
288
|
ret = bool(
|
|
287
|
-
Library.framework.MaaTaskerGetTaskDetail(
|
|
289
|
+
Library.framework().MaaTaskerGetTaskDetail(
|
|
288
290
|
self._handle,
|
|
289
291
|
MaaTaskId(task_id),
|
|
290
292
|
entry._handle,
|
|
@@ -339,63 +341,63 @@ class Tasker:
|
|
|
339
341
|
return
|
|
340
342
|
Tasker._api_properties_initialized = True
|
|
341
343
|
|
|
342
|
-
Library.framework.MaaTaskerCreate.restype = MaaTaskerHandle
|
|
343
|
-
Library.framework.MaaTaskerCreate.argtypes = [
|
|
344
|
+
Library.framework().MaaTaskerCreate.restype = MaaTaskerHandle
|
|
345
|
+
Library.framework().MaaTaskerCreate.argtypes = [
|
|
344
346
|
MaaNotificationCallback,
|
|
345
347
|
ctypes.c_void_p,
|
|
346
348
|
]
|
|
347
349
|
|
|
348
|
-
Library.framework.MaaTaskerDestroy.restype = None
|
|
349
|
-
Library.framework.MaaTaskerDestroy.argtypes = [MaaTaskerHandle]
|
|
350
|
+
Library.framework().MaaTaskerDestroy.restype = None
|
|
351
|
+
Library.framework().MaaTaskerDestroy.argtypes = [MaaTaskerHandle]
|
|
350
352
|
|
|
351
|
-
Library.framework.MaaTaskerBindResource.restype = MaaBool
|
|
352
|
-
Library.framework.MaaTaskerBindResource.argtypes = [
|
|
353
|
+
Library.framework().MaaTaskerBindResource.restype = MaaBool
|
|
354
|
+
Library.framework().MaaTaskerBindResource.argtypes = [
|
|
353
355
|
MaaTaskerHandle,
|
|
354
356
|
MaaResourceHandle,
|
|
355
357
|
]
|
|
356
358
|
|
|
357
|
-
Library.framework.MaaTaskerBindController.restype = MaaBool
|
|
358
|
-
Library.framework.MaaTaskerBindController.argtypes = [
|
|
359
|
+
Library.framework().MaaTaskerBindController.restype = MaaBool
|
|
360
|
+
Library.framework().MaaTaskerBindController.argtypes = [
|
|
359
361
|
MaaTaskerHandle,
|
|
360
362
|
MaaControllerHandle,
|
|
361
363
|
]
|
|
362
364
|
|
|
363
|
-
Library.framework.MaaTaskerInited.restype = MaaBool
|
|
364
|
-
Library.framework.MaaTaskerInited.argtypes = [MaaTaskerHandle]
|
|
365
|
+
Library.framework().MaaTaskerInited.restype = MaaBool
|
|
366
|
+
Library.framework().MaaTaskerInited.argtypes = [MaaTaskerHandle]
|
|
365
367
|
|
|
366
|
-
Library.framework.MaaTaskerPostTask.restype = MaaId
|
|
367
|
-
Library.framework.MaaTaskerPostTask.argtypes = [
|
|
368
|
+
Library.framework().MaaTaskerPostTask.restype = MaaId
|
|
369
|
+
Library.framework().MaaTaskerPostTask.argtypes = [
|
|
368
370
|
MaaTaskerHandle,
|
|
369
371
|
ctypes.c_char_p,
|
|
370
372
|
ctypes.c_char_p,
|
|
371
373
|
]
|
|
372
374
|
|
|
373
|
-
Library.framework.MaaTaskerStatus.restype = MaaStatus
|
|
374
|
-
Library.framework.MaaTaskerStatus.argtypes = [
|
|
375
|
+
Library.framework().MaaTaskerStatus.restype = MaaStatus
|
|
376
|
+
Library.framework().MaaTaskerStatus.argtypes = [
|
|
375
377
|
MaaTaskerHandle,
|
|
376
378
|
MaaTaskId,
|
|
377
379
|
]
|
|
378
380
|
|
|
379
|
-
Library.framework.MaaTaskerWait.restype = MaaStatus
|
|
380
|
-
Library.framework.MaaTaskerWait.argtypes = [
|
|
381
|
+
Library.framework().MaaTaskerWait.restype = MaaStatus
|
|
382
|
+
Library.framework().MaaTaskerWait.argtypes = [
|
|
381
383
|
MaaTaskerHandle,
|
|
382
384
|
MaaTaskId,
|
|
383
385
|
]
|
|
384
386
|
|
|
385
|
-
Library.framework.MaaTaskerRunning.restype = MaaBool
|
|
386
|
-
Library.framework.MaaTaskerRunning.argtypes = [MaaTaskerHandle]
|
|
387
|
+
Library.framework().MaaTaskerRunning.restype = MaaBool
|
|
388
|
+
Library.framework().MaaTaskerRunning.argtypes = [MaaTaskerHandle]
|
|
387
389
|
|
|
388
|
-
Library.framework.MaaTaskerPostStop.restype = MaaTaskId
|
|
389
|
-
Library.framework.MaaTaskerPostStop.argtypes = [MaaTaskerHandle]
|
|
390
|
+
Library.framework().MaaTaskerPostStop.restype = MaaTaskId
|
|
391
|
+
Library.framework().MaaTaskerPostStop.argtypes = [MaaTaskerHandle]
|
|
390
392
|
|
|
391
|
-
Library.framework.MaaTaskerGetResource.restype = MaaResourceHandle
|
|
392
|
-
Library.framework.MaaTaskerGetResource.argtypes = [MaaTaskerHandle]
|
|
393
|
+
Library.framework().MaaTaskerGetResource.restype = MaaResourceHandle
|
|
394
|
+
Library.framework().MaaTaskerGetResource.argtypes = [MaaTaskerHandle]
|
|
393
395
|
|
|
394
|
-
Library.framework.MaaTaskerGetController.restype = MaaControllerHandle
|
|
395
|
-
Library.framework.MaaTaskerGetController.argtypes = [MaaTaskerHandle]
|
|
396
|
+
Library.framework().MaaTaskerGetController.restype = MaaControllerHandle
|
|
397
|
+
Library.framework().MaaTaskerGetController.argtypes = [MaaTaskerHandle]
|
|
396
398
|
|
|
397
|
-
Library.framework.MaaTaskerGetRecognitionDetail.restype = MaaBool
|
|
398
|
-
Library.framework.MaaTaskerGetRecognitionDetail.argtypes = [
|
|
399
|
+
Library.framework().MaaTaskerGetRecognitionDetail.restype = MaaBool
|
|
400
|
+
Library.framework().MaaTaskerGetRecognitionDetail.argtypes = [
|
|
399
401
|
MaaTaskerHandle,
|
|
400
402
|
MaaRecoId,
|
|
401
403
|
MaaStringBufferHandle,
|
|
@@ -407,8 +409,8 @@ class Tasker:
|
|
|
407
409
|
MaaImageListBufferHandle,
|
|
408
410
|
]
|
|
409
411
|
|
|
410
|
-
Library.framework.MaaTaskerGetNodeDetail.restype = MaaBool
|
|
411
|
-
Library.framework.MaaTaskerGetNodeDetail.argtypes = [
|
|
412
|
+
Library.framework().MaaTaskerGetNodeDetail.restype = MaaBool
|
|
413
|
+
Library.framework().MaaTaskerGetNodeDetail.argtypes = [
|
|
412
414
|
MaaTaskerHandle,
|
|
413
415
|
MaaNodeId,
|
|
414
416
|
MaaStringBufferHandle,
|
|
@@ -416,8 +418,8 @@ class Tasker:
|
|
|
416
418
|
ctypes.POINTER(MaaBool),
|
|
417
419
|
]
|
|
418
420
|
|
|
419
|
-
Library.framework.MaaTaskerGetTaskDetail.restype = MaaBool
|
|
420
|
-
Library.framework.MaaTaskerGetTaskDetail.argtypes = [
|
|
421
|
+
Library.framework().MaaTaskerGetTaskDetail.restype = MaaBool
|
|
422
|
+
Library.framework().MaaTaskerGetTaskDetail.argtypes = [
|
|
421
423
|
MaaTaskerHandle,
|
|
422
424
|
MaaTaskId,
|
|
423
425
|
MaaStringBufferHandle,
|
|
@@ -426,20 +428,20 @@ class Tasker:
|
|
|
426
428
|
ctypes.POINTER(MaaStatus),
|
|
427
429
|
]
|
|
428
430
|
|
|
429
|
-
Library.framework.MaaTaskerGetLatestNode.restype = MaaBool
|
|
430
|
-
Library.framework.MaaTaskerGetLatestNode.argtypes = [
|
|
431
|
+
Library.framework().MaaTaskerGetLatestNode.restype = MaaBool
|
|
432
|
+
Library.framework().MaaTaskerGetLatestNode.argtypes = [
|
|
431
433
|
MaaTaskerHandle,
|
|
432
434
|
ctypes.c_char_p,
|
|
433
435
|
ctypes.POINTER(MaaRecoId),
|
|
434
436
|
]
|
|
435
437
|
|
|
436
|
-
Library.framework.MaaTaskerClearCache.restype = MaaBool
|
|
437
|
-
Library.framework.MaaTaskerClearCache.argtypes = [
|
|
438
|
+
Library.framework().MaaTaskerClearCache.restype = MaaBool
|
|
439
|
+
Library.framework().MaaTaskerClearCache.argtypes = [
|
|
438
440
|
MaaTaskerHandle,
|
|
439
441
|
]
|
|
440
442
|
|
|
441
|
-
Library.framework.MaaSetGlobalOption.restype = MaaBool
|
|
442
|
-
Library.framework.MaaSetGlobalOption.argtypes = [
|
|
443
|
+
Library.framework().MaaSetGlobalOption.restype = MaaBool
|
|
444
|
+
Library.framework().MaaSetGlobalOption.argtypes = [
|
|
443
445
|
MaaGlobalOption,
|
|
444
446
|
MaaOptionValue,
|
|
445
447
|
MaaOptionValueSize,
|