MaaFw 2.3.0a1__py3-none-macosx_13_0_arm64.whl → 2.3.0a2__py3-none-macosx_13_0_arm64.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.3.0a1
+Version: 2.3.0a2
 Summary: An automation black-box testing framework based on image recognition
 Author: MaaXYZ
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
@@ -108,8 +108,8 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [MaaYuan](https://github.com/syoius/MaaYuan) 代号鸢/如鸢 一键长草小助手  ![Pipeline](https://img.shields.io/badge/Pipeline-%23454545?logo=paddypower&logoColor=%23FFFFFF)  
   基于全新架构的 代号鸢/如鸢 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
 
-- [MAAGUI](https://github.com/Night-stars-1/maa-gui) MAAGUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript)  ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)  
-  基于全新架构的 MAA GUI。由 MaaFramework 强力驱动！
+- [MFW-ELE-GUI](https://github.com/Night-stars-1/maa-gui) MFW-ELE-GUI ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript)  ![Electron](https://img.shields.io/badge/Electron-3776AB?logo=electron&logoColor=black)  
+  基于全新架构的 MFW-ELE-GUI。由 MaaFramework 强力驱动！
 
 ## 生态共建
 

{MaaFw-2.3.0a1.dist-info → MaaFw-2.3.0a2.dist-info}/RECORD

@@ -9,22 +9,22 @@ 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=0hALFCHKHuOBQMSqyG4BYi1idJLy64UZMpqL4GQVZKs,14929
+maa/tasker.py,sha256=NZQOdJ9BKHQp4sfc0pKbXtF_m8ddnMPYng0KsGK9mbg,14599
 maa/toolkit.py,sha256=TlF8MoaGcWLklpISIlQNvc_rpTFBFrpDbLgctfQ_zqo,11325
-maa/bin/MaaNode.node,sha256=5yRaPnEPSJApkqMWMtQPLrTUrR9jbJmNNWunLI7qDUs,1354000
-maa/bin/libMaaAdbControlUnit.dylib,sha256=gNGtF8UH2lBxS7DTjrcheB3CUL2WFDOrEQhVTU7UsiQ,731520
-maa/bin/libMaaDbgControlUnit.dylib,sha256=RxxqFZC_wegI2aiiJWT7OEbs4_utE0RlTrP-b4mjBrQ,364992
-maa/bin/libMaaFramework.dylib,sha256=tW1_vALKD8-W7TcdyvRWuiVBPnY_sVzCL2d0bQbmeXs,2193792
-maa/bin/libMaaToolkit.dylib,sha256=drW7LiEnj7OJhC1HbAqgJm-9K_5YY4kXedUMM018wM4,800128
-maa/bin/libMaaUtils.dylib,sha256=Xfhe6zZbgkpyAc_NiuweRl6eUB_xLsj3AvboLrMFU0c,577632
+maa/bin/MaaNode.node,sha256=h3AHHn7Krd5LRPNcWFjTPILDXBFncwe0vtJKSxvnl2Q,1354000
+maa/bin/libMaaAdbControlUnit.dylib,sha256=oPvtnGDmdS0AjIzRwmPfzNQ1i8oBHgrA1gIALjTyrKE,731520
+maa/bin/libMaaDbgControlUnit.dylib,sha256=09_ydQ4YsU4Pqt9qGdSPqTMlmgN_CzqcDe1rQieLWn4,364992
+maa/bin/libMaaFramework.dylib,sha256=t7Q_wS3fPo8mVeqUbc7K0LxP5IGX91Rkbr-0dYRBn1U,2195248
+maa/bin/libMaaToolkit.dylib,sha256=vyzWNmR2CGwUzFAIVVefe_3MFqcP2VRMA_j-Wv_DYzE,800128
+maa/bin/libMaaUtils.dylib,sha256=Oqfs1H4_-EZdA3YwvfVYm2rMZ9FLp-BHsi3acUhYL4w,577632
 maa/bin/libc++.1.dylib,sha256=-NjWxcCQBJL03154cPG2_COm-OVCpwF8b81TJjYf2aw,1080592
 maa/bin/libc++abi.1.dylib,sha256=Lpwa1Kkuixz73imzeXDQ4OvpSGpsuFkXXHIvvY8pIzM,349840
 maa/bin/libfastdeploy_ppocr.dylib,sha256=ViKwyfN6Ww7xHuRfrzqTuxX1Fns67H1BgYn7sA4aLnw,4606768
 maa/bin/libonnxruntime.1.19.2.dylib,sha256=FzcCPn-JufK8YRRyPmKLQJ_aP43bN4fxhZoE2A9LTUo,17359936
 maa/bin/libopencv_world4.4.8.0.dylib,sha256=mO_QXdobdCYOmXFE39YfFzxBokvrchE23Xbl30XLhNg,13211472
 maa/bin/libunwind.1.dylib,sha256=CiUuVPISHrOccd8MA1NAK6EtyugjnDOSLqc9UbBVyso,110528
-MaaFw-2.3.0a1.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-MaaFw-2.3.0a1.dist-info/METADATA,sha256=RM5hjE8VzPetY3U4qceijcumdE0HmoXVNpV7uZ4H-K4,11027
-MaaFw-2.3.0a1.dist-info/WHEEL,sha256=JRuoozy0O6nPA5wOTZVLh5z23ChOY7RlJvoL-ISVaP0,103
-MaaFw-2.3.0a1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.3.0a1.dist-info/RECORD,,
+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=JRuoozy0O6nPA5wOTZVLh5z23ChOY7RlJvoL-ISVaP0,103
+MaaFw-2.3.0a2.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.3.0a2.dist-info/RECORD,,

maa/tasker.py

@@ -92,8 +92,8 @@ class Tasker:
         return bool(Library.framework.MaaTaskerRunning(self._handle))
 
     def post_stop(self) -> Job:
-        Library.framework.MaaTaskerPostStop(self._handle)
-        return Job(MaaId(0), self._stop_status, self._stop_wait)
+        taskid = Library.framework.MaaTaskerPostStop(self._handle)
+        return self._gen_task_job(taskid)
 
     def get_latest_node(self, name: str) -> Optional[NodeDetail]:
         c_node_id = MaaNodeId()
@@ -201,15 +201,6 @@ class Tasker:
     def _task_wait(self, id: int) -> ctypes.c_int32:
         return Library.framework.MaaTaskerWait(self._handle, id)
 
-    def _stop_status(self, id: int) -> MaaStatusEnum:
-        return MaaStatusEnum.succeeded if not self.running else MaaStatusEnum.running
-
-    def _stop_wait(self, id: int) -> MaaStatusEnum:
-        # TODO: 这个应该由 callback 来处理
-        while self.running:
-            time.sleep(0.1)
-        return MaaStatusEnum.succeeded
-
     def get_recognition_detail(self, reco_id: int) -> Optional[RecognitionDetail]:
         name = StringBuffer()
         algorithm = StringBuffer()
@@ -316,7 +307,9 @@ class Tasker:
             detail = self.get_node_detail(int(c_node_id_list[i]))
             nodes.append(detail)
 
-        return TaskDetail(task_id=task_id, entry=entry.get(), nodes=nodes, status=Status(status))
+        return TaskDetail(
+            task_id=task_id, entry=entry.get(), nodes=nodes, status=Status(status)
+        )
 
     _api_properties_initialized: bool = False
 
@@ -398,7 +391,7 @@ class Tasker:
         Library.framework.MaaTaskerRunning.restype = MaaBool
         Library.framework.MaaTaskerRunning.argtypes = [MaaTaskerHandle]
 
-        Library.framework.MaaTaskerPostStop.restype = MaaBool
+        Library.framework.MaaTaskerPostStop.restype = MaaTaskId
         Library.framework.MaaTaskerPostStop.argtypes = [MaaTaskerHandle]
 
         Library.framework.MaaTaskerGetResource.restype = MaaResourceHandle