fix: python binding

MaaXYZ · Sep 20, 2024 · 216207f · 216207f
1 parent a647269
commit 216207f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 72 deletions.
diff --git a/source/binding/Python/maa/controller.py b/source/binding/Python/maa/controller.py
@@ -318,16 +318,7 @@ def __init__(
             MaaAdbInputMethod(input_methods),
             json.dumps(config, ensure_ascii=False).encode(),
             str(agent_path).encode(),
-            (
-                self._notification_handler.c_callback
-                if self._notification_handler
-                else None
-            ),
-            (
-                self._notification_handler.c_callback_arg
-                if self._notification_handler
-                else None
-            ),
+            *NotificationHandler._gen_c_param(self._notification_handler)
         )
 
         if not self._handle:
@@ -365,16 +356,7 @@ def __init__(
             hWnd,
             MaaWin32ScreencapMethod(screencap_method),
             MaaWin32InputMethod(input_method),
-            (
-                self._notification_handler.c_callback
-                if self._notification_handler
-                else None
-            ),
-            (
-                self._notification_handler.c_callback_arg
-                if self._notification_handler
-                else None
-            ),
+            *NotificationHandler._gen_c_param(self._notification_handler)
         )
 
         if not self._handle:
@@ -410,16 +392,7 @@ def __init__(
             str(write_path).encode(),
             MaaDbgControllerType(dbg_type),
             json.dumps(config, ensure_ascii=False).encode(),
-            (
-                self._notification_handler.c_callback
-                if self._notification_handler
-                else None
-            ),
-            (
-                self._notification_handler.c_callback_arg
-                if self._notification_handler
-                else None
-            ),
+            *NotificationHandler._gen_c_param(self._notification_handler)
         )
 
         if not self._handle:
@@ -468,16 +441,7 @@ def __init__(
         self._handle = Library.framework.MaaCustomControllerCreate(
             self.c_handle,
             self.c_arg,
-            (
-                self._notification_handler.c_callback
-                if self._notification_handler
-                else None
-            ),
-            (
-                self._notification_handler.c_callback_arg
-                if self._notification_handler
-                else None
-            ),
+            *NotificationHandler._gen_c_param(self._notification_handler)
         )
 
         if not self._handle:
@@ -674,7 +638,9 @@ def _c_swipe_agent(
             ctypes.py_object,
         ).value
 
-        return int(self.swipe(int(c_x1), int(c_y1), int(c_x2), int(c_y2), int(c_duration)))
+        return int(
+            self.swipe(int(c_x1), int(c_y1), int(c_x2), int(c_y2), int(c_duration))
+        )
 
     @staticmethod
     @MaaCustomControllerCallbacks.TouchDownFunc

diff --git a/source/binding/Python/maa/notification_handler.py b/source/binding/Python/maa/notification_handler.py
@@ -1,6 +1,7 @@
 import ctypes
 import json
-from abc import ABC, abstractmethod
+from abc import ABC
+from typing import Optional, Tuple
 from enum import Enum
 from dataclasses import dataclass
 
@@ -153,6 +154,15 @@ def c_callback(self) -> MaaNotificationCallback:
     def c_callback_arg(self) -> ctypes.c_void_p:
         return ctypes.c_void_p.from_buffer(ctypes.py_object(self))
 
+    @staticmethod
+    def _gen_c_param(
+        handler: Optional["NotificationHandler"],
+    ) -> Tuple[MaaNotificationCallback, ctypes.c_void_p]:
+        if handler:
+            return handler.c_callback, handler.c_callback_arg
+        else:
+            return NotificationHandler._c_notification_agent, ctypes.c_void_p()
+
     @staticmethod
     def _notification_type(message: str) -> NotificationType:
         if message.endswith(".Starting"):

diff --git a/source/binding/Python/maa/resource.py b/source/binding/Python/maa/resource.py
@@ -35,16 +35,7 @@ def __init__(
         else:
             self._notification_handler = notification_handler
             self._handle = Library.framework.MaaResourceCreate(
-                (
-                    self._notification_handler.c_callback
-                    if self._notification_handler
-                    else None
-                ),
-                (
-                    self._notification_handler.c_callback_arg
-                    if self._notification_handler
-                    else None
-                ),
+                *NotificationHandler._gen_c_param(self._notification_handler)
             )
             self._own = True
 

diff --git a/source/binding/Python/maa/tasker.py b/source/binding/Python/maa/tasker.py
@@ -38,16 +38,7 @@ def __init__(
         else:
             self._notification_handler = notification_handler
             self._handle = Library.framework.MaaTaskerCreate(
-                (
-                    self._notification_handler.c_callback
-                    if self._notification_handler
-                    else None
-                ),
-                (
-                    self._notification_handler.c_callback_arg
-                    if self._notification_handler
-                    else None
-                ),
+                *NotificationHandler._gen_c_param(self._notification_handler)
             )
             self._own = True
 

diff --git a/source/binding/Python/maa/toolkit.py b/source/binding/Python/maa/toolkit.py
@@ -172,16 +172,7 @@ def pi_run_cli(
                 str(resource_path).encode(),
                 str(user_path).encode(),
                 directly,
-                (
-                    Toolkit._pi_notification_handler.c_callback
-                    if Toolkit._pi_notification_handler
-                    else None
-                ),
-                (
-                    Toolkit._pi_notification_handler.c_callback_arg
-                    if Toolkit._pi_notification_handler
-                    else None
-                ),
+                *NotificationHandler._gen_c_param(Toolkit._pi_notification_handler),
             )
         )
 

diff --git a/test/python/binding_test.py b/test/python/binding_test.py
@@ -107,6 +107,11 @@ def run(
 
 
 def api_test():
+    r1 = Resource()
+    r2 = Resource()
+    t1 = Tasker()
+    t2 = Tasker()
+
     resource = Resource(MyNotificationHandler())
     print(f"resource: {resource}")