MaaFw 2.3.0a2__py3-none-macosx_13_0_x86_64.whl → 2.3.0b1__py3-none-macosx_13_0_x86_64.whl

{MaaFw-2.3.0a2.dist-info → MaaFw-2.3.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.3.0a2
+Version: 2.3.0b1
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework

MaaFw-2.3.0b1.dist-info/RECORD

@@ -0,0 +1,30 @@
+maa/__init__.py,sha256=LoL_sLJI9UbTUya7U6MRSc3PJ9uuhcDl8xtlBjRc2TA,230
+maa/buffer.py,sha256=JLxAF8esnAN4SlkZf2OMMlpv0SV3WK7OyMF8w7sTaC8,16617
+maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
+maa/controller.py,sha256=61R4asxDLChiZBSD1hEdGdbpoyOxHttOeflNuJ7DmqM,22381
+maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
+maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
+maa/define.py,sha256=uvqM04p6NLfju1Zz-EMR-8Af8MZGpEImMAt3QdcYvIA,13114
+maa/job.py,sha256=jXGQ4YV_G8sAi-B7OmUrbPCEIf4xZjWqCSr36LT6Qt0,1153
+maa/library.py,sha256=AwdFx_zWHEah81NwOmD-SDzysSuVbsreDLIaxpWsXvY,1267
+maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
+maa/resource.py,sha256=TAULVwajpPThbLreB0JbhMWTv82r8Y3fFLM2b2VC91Y,9349
+maa/tasker.py,sha256=tYD-YvqRPwMzt-h8UToJ01CsN4mO2mJHEnjsj5tTkSU,14425
+maa/toolkit.py,sha256=BE_o8XgznuW1d_7YairYHOrqOp5Ha9GYMcinsYYBgVM,11163
+maa/bin/MaaNode.node,sha256=L-hgxWA8KFVCvJlg1_bEK67la74cnTS2abz2C5XiAsA,1414912
+maa/bin/libMaaAdbControlUnit.dylib,sha256=2_pTr04WS-U4EZJ3f5QeAcI3y0aQDpPBSHEgjatVIZs,784656
+maa/bin/libMaaDbgControlUnit.dylib,sha256=oRKppjd3UBVJ9iV91llfuG3G1T_IsQESm09im8DuYdQ,383632
+maa/bin/libMaaFramework.dylib,sha256=-JLYGW15l_b5ZbyfzmFgjIkBpAnbvrQ6t1sa7XihHZc,2353392
+maa/bin/libMaaToolkit.dylib,sha256=ev-8pAorY95RRUVfdQmviqhQiUf7COqzEVRXBfzudXk,844640
+maa/bin/libMaaUtils.dylib,sha256=AqmuEQIjfjxBfkSidw7iQ5M_bEzUih6VMWnVNlrxyRE,596480
+maa/bin/libc++.1.dylib,sha256=Gg-NPCKBjSAFC2wFiF899zarzDx4D-j-SsZRh8Zwfm4,1119312
+maa/bin/libc++abi.1.dylib,sha256=3rC2rctVrRQtC6tJEx8vS5N1wrhNJ2WJtbF0tgNWcR4,349792
+maa/bin/libfastdeploy_ppocr.dylib,sha256=4Hw-k3hX-lN4dF9ESbHQ-mJJ_faa69ofizSH2Sq8Gjg,5892048
+maa/bin/libonnxruntime.1.19.2.dylib,sha256=X84aZ3Mf5w4OF79ZezTgfAAY7AE-8GeTx9uC54rN408,20095056
+maa/bin/libopencv_world4.4.8.0.dylib,sha256=FqtDF6lu7jspsoF61q2eTTAb_q8lmpC1m0VP18AXajo,17058736
+maa/bin/libunwind.1.dylib,sha256=J7xL-Nmf8RnImMEUVQhrqJBiAJg5pTFQMW9wlhQrudc,110656
+MaaFw-2.3.0b1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.3.0b1.dist-info/METADATA,sha256=mUfx8ndcr-PQBDvbERiTcXL3X_Zf4Pfih74eyE_vnuo,11041
+MaaFw-2.3.0b1.dist-info/WHEEL,sha256=s5GHEIWLEeQRPg5-jpmlVeNDEkLEB_XogMK3BU9dd_M,104
+MaaFw-2.3.0b1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.3.0b1.dist-info/RECORD,,

maa/__init__.py

@@ -1,10 +1,12 @@
 import os
+from pathlib import Path
 
 from .library import Library
 
-__PATH = os.path.join(os.path.dirname(__file__), "bin")
+env_path = Path(os.environ.get("MAAFW_BINARY_PATH"))
+if env_path:
+    __PATH = env_path
+else:
+    __PATH = Path(Path(__file__).parent, "bin")
 
-if os.path.exists(__PATH):
-    ver = Library.open(__PATH)
-    if ver:
-        print(f"MaaFw version: {ver}")
+Library.open(__PATH)

maa/buffer.py

@@ -13,10 +13,6 @@ class StringBuffer:
     _own: bool
 
     def __init__(self, handle: Optional[MaaStringBufferHandle] = None):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
         self._set_api_properties()
 
         if handle:
@@ -97,10 +93,6 @@ class StringListBuffer:
     _own: bool
 
     def __init__(self, handle: Optional[MaaStringListBufferHandle] = None):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
         self._set_api_properties()
 
         if handle:
@@ -203,11 +195,6 @@ class ImageBuffer:
     _own: bool
 
     def __init__(self, c_handle: Optional[MaaImageBufferHandle] = None):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         self._set_api_properties()
 
         if c_handle:
@@ -309,10 +296,6 @@ class ImageListBuffer:
     _own: bool
 
     def __init__(self, c_handle: Optional[MaaImageListBufferHandle] = None):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
         self._set_api_properties()
 
         if c_handle:
@@ -413,11 +396,6 @@ class RectBuffer:
     _own: bool
 
     def __init__(self, c_handle: Optional[MaaRectHandle] = None):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         self._set_api_properties()
 
         if c_handle:

maa/controller.py

@@ -28,11 +28,6 @@ class Controller:
         self,
         handle: Optional[MaaControllerHandle] = None,
     ):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         self._set_api_properties()
 
         if handle:
@@ -152,7 +147,7 @@ class Controller:
                 ctypes.sizeof(ctypes.c_int32),
             )
         )
-    
+
     def set_screenshot_use_raw_size(self, enable: bool) -> bool:
         cbool = MaaBool(enable)
         return bool(

maa/library.py

@@ -2,17 +2,17 @@ import ctypes
 import ctypes.util
 import pathlib
 import platform
-from typing import Optional, Union
 
 from .define import *
 
 
 class Library:
 
-    initialized = False
-
     @staticmethod
-    def open(path: Union[pathlib.Path, str]) -> Optional[str]:
+    def open(path: pathlib.Path):
+        if not path.exists():
+            raise FileNotFoundError(f"`{path}` does not exist.")
+
         platform_values = {
             "windows": ("MaaFramework.dll", "MaaToolkit.dll"),
             "darwin": ("libMaaFramework.dylib", "libMaaToolkit.dylib"),
@@ -26,40 +26,16 @@ class Library:
         else:
             lib_import = ctypes.CDLL
 
-        try:
-            Library.framework_libpath = (
-                pathlib.Path(path) / platform_values[platform_type][0]
-            )
-            Library.framework = lib_import(str(Library.framework_libpath))
-        except OSError:
-            Library.framework_libpath = ctypes.util.find_library("MaaFramework")
-            Library.framework = lib_import(str(Library.framework_libpath))
-
-        try:
-            Library.toolkit_libpath = (
-                pathlib.Path(path) / platform_values[platform_type][1]
-            )
-            Library.toolkit = lib_import(str(Library.toolkit_libpath))
-        except OSError:
-            Library.toolkit_libpath = ctypes.util.find_library("MaaToolkit")
-            Library.toolkit = lib_import(str(Library.toolkit_libpath))
+        Library.framework_libpath = path / platform_values[platform_type][0]
+        Library.framework = lib_import(str(Library.framework_libpath))
 
-        if not Library.framework or not Library.toolkit:
-            Library.initialized = False
-            return None
+        Library.toolkit_libpath = path / platform_values[platform_type][1]
+        Library.toolkit = lib_import(str(Library.toolkit_libpath))
 
         Library._set_api_properties()
-        Library.initialized = True
-
-        return Library.version()
 
     @staticmethod
     def version() -> str:
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         return Library.framework.MaaVersion().decode()
 
     @staticmethod

maa/resource.py

@@ -21,12 +21,6 @@ class Resource:
         notification_handler: Optional[NotificationHandler] = None,
         handle: Optional[MaaResourceHandle] = None,
     ):
-
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         self._set_api_properties()
 
         if handle:

maa/tasker.py

@@ -1,6 +1,5 @@
 import ctypes
 import json
-import time
 from pathlib import Path
 from typing import Any, Dict, Optional, Union
 
@@ -25,11 +24,6 @@ class Tasker:
         notification_handler: Optional[NotificationHandler] = None,
         handle: Optional[MaaTaskerHandle] = None,
     ):
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         self._set_api_properties()
 
         if handle:

maa/toolkit.py

@@ -189,11 +189,6 @@ class Toolkit:
             return
         Toolkit._api_properties_initialized = True
 
-        if not Library.initialized:
-            raise RuntimeError(
-                "Library not initialized, please call `library.open()` first."
-            )
-
         Library.toolkit.MaaToolkitConfigInitOption.restype = MaaBool
         Library.toolkit.MaaToolkitConfigInitOption.argtypes = [
             ctypes.c_char_p,

MaaFw-2.3.0a2.dist-info/RECORD

@@ -1,30 +0,0 @@
-maa/__init__.py,sha256=rBIC5X_VsfFXOMJRdKjgDyO428XHgeWAT3t6ZYmqO1M,207
-maa/buffer.py,sha256=E0tuasXPm6A_4r22PGSwObgGXb2qCMJrT5yrAvcgk6I,17424
-maa/context.py,sha256=Y71T92tIAGq6x8bJfYX8emUPEmPUA7nhnWgqOHh390E,5722
-maa/controller.py,sha256=VOz4Und15toq6oehHR0BHC10LMhFVqKAcImQNXCqHxQ,22547
-maa/custom_action.py,sha256=pqPjDK7nVkGL8fceJadwb7IkeGjYc2X8RaXZOnVZXQs,2527
-maa/custom_recognition.py,sha256=Y3Asdgb19YZioOVZZVs_hLSW6uBg7WDZDQPR2XfZpFU,3087
-maa/define.py,sha256=uvqM04p6NLfju1Zz-EMR-8Af8MZGpEImMAt3QdcYvIA,13114
-maa/job.py,sha256=jXGQ4YV_G8sAi-B7OmUrbPCEIf4xZjWqCSr36LT6Qt0,1153
-maa/library.py,sha256=nDTBUFC6_91gmyy8SfkTTccMZET9XGU8IxvuVUEwQ6E,2099
-maa/notification_handler.py,sha256=KjQlu66fNVwGGli8kuhNdSZPj2vO_oXjaNt_B1i_5wA,5251
-maa/resource.py,sha256=74mQvWr4ZYkE2Y3g7ranbai5XEYhQdUAP7SW_U8GrgI,9512
-maa/tasker.py,sha256=NZQOdJ9BKHQp4sfc0pKbXtF_m8ddnMPYng0KsGK9mbg,14599
-maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
-maa/bin/MaaNode.node,sha256=L-hgxWA8KFVCvJlg1_bEK67la74cnTS2abz2C5XiAsA,1414912
-maa/bin/libMaaAdbControlUnit.dylib,sha256=vXzhEZ9Kc4mUt4u2xUrkpjBGdLEPwg4sbfwSON2N7LE,784656
-maa/bin/libMaaDbgControlUnit.dylib,sha256=f6kTZe2de4Mh0l5IVmJ-YW-8JrFIFtCYBb2vBLb04ME,383632
-maa/bin/libMaaFramework.dylib,sha256=qU_mhvNl2_0_vFbO1AOMrBS22QvlQSJ-N1HatzKk4og,2352368
-maa/bin/libMaaToolkit.dylib,sha256=4o30XpwbRMTl20d_W6AnUqJj2hbr-OwMSdiJv4kYFUU,844640
-maa/bin/libMaaUtils.dylib,sha256=QA0IHHP8P0zvxDMtN3HPnX9A80XB0YKC39_OrD8ITqw,596192
-maa/bin/libc++.1.dylib,sha256=Gg-NPCKBjSAFC2wFiF899zarzDx4D-j-SsZRh8Zwfm4,1119312
-maa/bin/libc++abi.1.dylib,sha256=3rC2rctVrRQtC6tJEx8vS5N1wrhNJ2WJtbF0tgNWcR4,349792
-maa/bin/libfastdeploy_ppocr.dylib,sha256=4Hw-k3hX-lN4dF9ESbHQ-mJJ_faa69ofizSH2Sq8Gjg,5892048
-maa/bin/libonnxruntime.1.19.2.dylib,sha256=X84aZ3Mf5w4OF79ZezTgfAAY7AE-8GeTx9uC54rN408,20095056
-maa/bin/libopencv_world4.4.8.0.dylib,sha256=FqtDF6lu7jspsoF61q2eTTAb_q8lmpC1m0VP18AXajo,17058736
-maa/bin/libunwind.1.dylib,sha256=J7xL-Nmf8RnImMEUVQhrqJBiAJg5pTFQMW9wlhQrudc,110656
-MaaFw-2.3.0a2.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.3.0a2.dist-info/METADATA,sha256=RRj8xi_rBmUBOJfbIuyomaUaM1IBxTLDjlzvoqOg6As,11041
-MaaFw-2.3.0a2.dist-info/WHEEL,sha256=s5GHEIWLEeQRPg5-jpmlVeNDEkLEB_XogMK3BU9dd_M,104
-MaaFw-2.3.0a2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.3.0a2.dist-info/RECORD,,