reywechat 1.0.48__py3-none-any.whl → 1.0.50__py3-none-any.whl

reywechat/__init__.py

@@ -20,7 +20,6 @@ rdb : Database methods.
 rcache : Cache methods.
 rlog : Log methods.
 rreceive : Receive methods.
-rschedule : Schedule methods.
 rsend : Send methods.
 rtrigger : Trigger methods.
 rwechat : WeChat methods.

reywechat/rall.py

@@ -15,7 +15,6 @@ from .rclient import *
 from .rdb import *
 from .rlog import *
 from .rreceive import *
-from .rschedule import *
 from .rsend import *
 from .rtrigger import *
 from .rwechat import *

reywechat/rdb.py

@@ -19,7 +19,7 @@ from reykit.rwrap import wrap_thread
 
 from .rbase import WeChatBase
 from .rreceive import WeChatMessage
-from .rsend import WeChatSendTypeEnum, WeChatSendParameter
+from .rsend import WeChatSendTypeEnum, WeChatSendStatusEnum, WeChatSendParameter
 from .rwechat import WeChat
 
 
@@ -1077,7 +1077,7 @@ class WeChatDatabase(WeChatBase):
             """
 
             # Check.
-            if send_param.status != send_param.StatusEnum.SENT:
+            if send_param.status != WeChatSendStatusEnum.SENT:
                 return
 
             # Handle parameter.
@@ -1206,7 +1206,7 @@ class WeChatDatabase(WeChatBase):
                     send_id,
                     **parameter
                 )
-                send_param.status = send_param.StatusEnum.WAIT
+                send_param.status = WeChatSendStatusEnum.WAIT
                 self.wechat.sender.queue.put(send_param)
 
             # Commit.

reywechat/rreceive.py

@@ -27,7 +27,7 @@ from reykit.rtime import now, sleep, wait, to_time, time_to
 from reykit.rwrap import wrap_thread, wrap_exc
 
 from .rbase import WeChatBase, WeChatTriggerError
-from .rsend import WeChatSendTypeEnum
+from .rsend import WeChatSendTypeEnum, WeChatSendStatusEnum
 from .rwechat import WeChat
 
 
@@ -67,7 +67,8 @@ class WeChatMessage(WeChatBase):
     WeChat message type.
     """
 
-    TypeEnum = WeChatSendTypeEnum
+    SendTypeEnum = WeChatSendTypeEnum
+    SendStatusEnum = WeChatSendStatusEnum
 
 
     def __init__(
@@ -1095,8 +1096,6 @@ class WechatReceiver(WeChatBase):
     WeChat receiver type.
     """
 
-    TypeEnum = WeChatSendTypeEnum
-
 
     def __init__(
         self,

reywechat/rsend.py

@@ -79,8 +79,8 @@ class WeChatSendParameter(WeChatBase):
     WeChat send parameters type.
     """
 
-    TypeEnum = WeChatSendTypeEnum
-    StatusEnum = WeChatSendStatusEnum
+    SendTypeEnum = WeChatSendTypeEnum
+    SendStatusEnum = WeChatSendStatusEnum
 
 
     @overload
@@ -204,7 +204,8 @@ class WeChatSender(WeChatBase):
     WeChatSendTypeEnum : Send type enumeration.
     """
 
-    TypeEnum = WeChatSendTypeEnum
+    SendTypeEnum = WeChatSendTypeEnum
+    SendStatusEnum = WeChatSendStatusEnum
 
 
     def __init__(self, wechat: WeChat) -> None:
@@ -267,7 +268,7 @@ class WeChatSender(WeChatBase):
                 # Save.
                 send_param.exc_reports.append(exc_text)
 
-            send_param.status = send_param.StatusEnum.SENT
+            send_param.status = WeChatSendStatusEnum.SENT
 
             ## Handler.
             for handler in self.handlers:
@@ -462,7 +463,7 @@ class WeChatSender(WeChatBase):
             receive_id,
             **params
         )
-        send_param.status = send_param.StatusEnum.INIT
+        send_param.status = WeChatSendStatusEnum.INIT
         handle_handler_exception = lambda exc_text, *_: send_param.exc_reports.append(exc_text)
 
         # Handler.

reywechat/rwechat.py

@@ -69,8 +69,7 @@ class WeChat(WeChatBase):
         from .rdb import WeChatDatabase
         from .rlog import WeChatLog
         from .rreceive import WechatReceiver
-        from .rschedule import WeChatSchedule
-        from .rsend import WeChatSender
+        from .rsend import WeChatSendTypeEnum, WeChatSendStatusEnum, WeChatSender
 
         # Set attribute.
         self.project_dir = project_dir or os_getcwd()
@@ -83,7 +82,6 @@ class WeChat(WeChatBase):
         self.trigger = self.receiver.trigger
         self.sender = WeChatSender(self)
         self.database = WeChatDatabase(self, database)
-        self.schedule = WeChatSchedule(self)
 
         ## Client.
         self.client_version = self.client.client_version
@@ -102,6 +100,8 @@ class WeChat(WeChatBase):
         self.trigger_add_rule = self.trigger.add_rule
 
         ## Send.
+        self.SendTypeEnum = WeChatSendTypeEnum
+        self.SendstatusEnum = WeChatSendStatusEnum
         self.send_add_handler = self.sender.add_handler
         self.send = self.sender.send
         self.send_start = self.sender.start
@@ -111,11 +111,6 @@ class WeChat(WeChatBase):
         ## Database.
         self.database_build = self.database.build_db
 
-        ## Schedule.
-        self.schedule_add_task = self.schedule.add_task
-        self.schedule_pause = self.schedule.pause
-        self.schedule_resume = self.schedule.resume
-
 
     def start(self) -> None:
         """

{reywechat-1.0.48.dist-info → reywechat-1.0.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.48
+Version: 1.0.50
 Summary: WeChat method set.
 Project-URL: homepage, https://github.com/reyxbo/reywechat/
 Author-email: Rey <reyxbo@163.com>

reywechat-1.0.50.dist-info/RECORD

@@ -0,0 +1,16 @@
+reywechat/__init__.py,sha256=FXc3XSiPLLmz9bgZdiYKxeWX-7VT9RqPc_EkXp3Kk0I,476
+reywechat/rall.py,sha256=5J_X-XMOyb1Vp1jyS9-oRFXGOtp2vRPX1g3tJot_Eck,371
+reywechat/rbase.py,sha256=hbxn5spvcl_C_Bw8A9teulOXT9GMlxUw145_YbXIOzc,1124
+reywechat/rcache.py,sha256=7UsHHfgFOgxuSqlTSAO6CprgUUOeBCXYus0kxmRBQxk,908
+reywechat/rclient.py,sha256=lc1CPle9h08mwP8NlJN0ybzcNJxtpV0ma6q6cz1RIxk,22518
+reywechat/rdb.py,sha256=YHkW81RZIdHCt2vvjgFKOZxU-EHyVf9F_XT_nOc7jxg,47354
+reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
+reywechat/rreceive.py,sha256=ezz6-RVKWmll-TuKXaAnmQRRQdn91v6DJlfpWcTuG20,36213
+reywechat/rsend.py,sha256=TiSjHMccbjM2U6na3xPGKq3RhoaW23-BsgLdRyJSGEw,18047
+reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
+reywechat/rwechat.py,sha256=nIyrf3hB3n03picxV1f1hWNFzhFOXcV201ZuS97P3N4,4741
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.50.dist-info/METADATA,sha256=AlBjYWk7HvQsccQ_YggBO5OpES7JFw8YwpgEtRNZGww,1551
+reywechat-1.0.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.50.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.50.dist-info/RECORD,,

reywechat/rschedule.py

@@ -1,93 +0,0 @@
-# !/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-@Time    : 2024-01-09 21:47:02
-@Author  : Rey
-@Contact : reyxbo@163.com
-@Explain : Schedule methods.
-"""
-
-
-from __future__ import annotations
-from typing import Any, Literal
-from collections.abc import Callable
-from reykit.rschedule import Schedule
-
-from .rbase import WeChatBase
-from .rsend import WeChatSendTypeEnum
-from .rwechat import WeChat
-
-
-class WeChatSchedule(WeChatBase):
-    """
-    WeChat schedule type.
-    """
-
-    TypeEnum = WeChatSendTypeEnum
-
-
-    def __init__(
-        self,
-        wechat: WeChat
-    ) -> None:
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        wechat : `WeChatClient` instance.
-        """
-
-        # Set attribute.
-        self.wechat = wechat
-        self.rrschedule = Schedule()
-
-        # Start.
-        self.rrschedule.start()
-
-
-    def add_task(
-        self,
-        trigger: Literal['date', 'interval', 'cron'],
-        task: Callable[[WeChatSchedule], Any],
-        **trigger_kwargs: Any
-    ) -> None:
-        """
-        Add schedule send message task.
-
-        Parameters
-        ----------
-        trigger : Trigger type.
-        task : Function of task. The parameter is the `WeChatSchedule` instance.
-        trigger_kwargs : Trigger keyword arguments.
-        """
-
-        # Handle parameter.
-        args = (self,)
-
-        # Add.
-        self.rrschedule.add_task(
-            task,
-            trigger,
-            args,
-            **trigger_kwargs
-        )
-
-
-    def pause(self) -> None:
-        """
-        Pause scheduler.
-        """
-
-        # Pause.
-        self.rrschedule.pause()
-
-
-    def resume(self) -> None:
-        """
-        Resume scheduler.
-        """
-
-        # Pause.
-        self.rrschedule.resume

reywechat-1.0.48.dist-info/RECORD

@@ -1,17 +0,0 @@
-reywechat/__init__.py,sha256=jnk8xZKR7nkRXIcM7fvtX46WcDp-lPx1ctLnWvCi4S4,507
-reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
-reywechat/rbase.py,sha256=hbxn5spvcl_C_Bw8A9teulOXT9GMlxUw145_YbXIOzc,1124
-reywechat/rcache.py,sha256=7UsHHfgFOgxuSqlTSAO6CprgUUOeBCXYus0kxmRBQxk,908
-reywechat/rclient.py,sha256=lc1CPle9h08mwP8NlJN0ybzcNJxtpV0ma6q6cz1RIxk,22518
-reywechat/rdb.py,sha256=9WI0sxMscGMu-PnXKGxHThoO-kr2v8VPqQbxbZdjedw,47334
-reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=dVKCGv6oTrmMK-v_zf5j0Zr04p0r2kbkWWAnkFYBuSY,36181
-reywechat/rschedule.py,sha256=JzjYdjtFnbNNnpRGnCUJJThh3QreD271GXO6Emz216U,1865
-reywechat/rsend.py,sha256=GTMAe-w8j8vEqxoqjFEb0tEg8z1qf3RtJyZgckVgvW4,17994
-reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
-reywechat/rwechat.py,sha256=YW8guhhZQde-Ic0akvh_NpIf3C2xNSw71sTi6CpLVo8,4877
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.48.dist-info/METADATA,sha256=T58AXNaq9iq0qzYZZwPHB5cjFFqxdsxFQ7-R9mz5Aww,1551
-reywechat-1.0.48.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.48.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.48.dist-info/RECORD,,