MaaFw 2.3.0a1__py3-none-manylinux2014_aarch64.whl → 2.3.0a3__py3-none-manylinux2014_aarch64.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MaaFw
-Version: 2.3.0a1
+Version: 2.3.0a3
 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.0a3.dist-info}/RECORD

@@ -9,19 +9,19 @@ 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=YCGO1e-DRlGqLkj3PEvRd77kC6ViBL8hcFj65mrHnbU,1049456
-maa/bin/libMaaAdbControlUnit.so,sha256=zMG_Ao2tPN5VtcBc6n3B7Rp6KNtR-UJUCsnYX6oDiIU,1371720
-maa/bin/libMaaDbgControlUnit.so,sha256=Qav9KyaoY8Cw9mHEpYBiU309LcR9SukEsO_hZgqXnNM,527664
-maa/bin/libMaaFramework.so,sha256=HD4zRxzaLYlfL7YL0c8vP1FO29S4N48OPq8j6_Mk4xY,3126984
-maa/bin/libMaaToolkit.so,sha256=O7qmJHSl_NZq25bJ4NUZM9R6MFcJIg_m7veqexavqCY,1082536
-maa/bin/libMaaUtils.so,sha256=WHNdKJX32gpBgd1mLScGQKZWebUifIA-95_4uTXtXto,918360
+maa/bin/MaaNode.node,sha256=MNEa9-TtBLbuLTMaILzCeIqC5Q18X9XCVglaE-oXnHU,1049456
+maa/bin/libMaaAdbControlUnit.so,sha256=XecMx9ZL7ZyNSMPYnohDvLmutLA78hPQAsJGuRq_fTE,1371720
+maa/bin/libMaaDbgControlUnit.so,sha256=H7FSwe1p08jw7XYEhXc7wNvjd64SZ8__X42bX6PbEdA,527664
+maa/bin/libMaaFramework.so,sha256=sY_ukZV3v-AT6mGN_JO9t59WyhyN6vd5w39JaUdxfJs,3129240
+maa/bin/libMaaToolkit.so,sha256=mENup9Pj2TUgTYNTca1Tf812ndbkxKv0ohW3LbooC2o,1082536
+maa/bin/libMaaUtils.so,sha256=YmApsw64ZJr_SL_CjZy1kvEAieg3cyrnxh3uDvIz3bw,918360
 maa/bin/libfastdeploy_ppocr.so,sha256=onQlZ9_VSIifDFaeLpRwqHEemalJJaCJCz0RkVyO-c0,5487856
 maa/bin/libonnxruntime.so.1,sha256=RGCtVDSf6D2K8-eXTUckpRCSZQbHHrXlZTWUFVR8yDw,19227776
 maa/bin/libopencv_world4.so.408,sha256=0T8LLfBerUbs-bPeVK4jRPGiMtDuflZ3T6nqQ5caBTM,15547272
-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=NKhwKPdlOAbZ859udgLkSMA9gaUh7CT-y1WwMhx29b8,107
-MaaFw-2.3.0a1.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
-MaaFw-2.3.0a1.dist-info/RECORD,,
+MaaFw-2.3.0a3.dist-info/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+MaaFw-2.3.0a3.dist-info/METADATA,sha256=e1JhURwF5jYLc2T7QehlwHdR2ZJSwY1pyMfVv2CZLUU,11041
+MaaFw-2.3.0a3.dist-info/WHEEL,sha256=NKhwKPdlOAbZ859udgLkSMA9gaUh7CT-y1WwMhx29b8,107
+MaaFw-2.3.0a3.dist-info/top_level.txt,sha256=G8r2L__aYaMq4S3R70G6NsfEROiVp08kUcWvATzk2J8,4
+MaaFw-2.3.0a3.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