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

reywechat/__init__.py

@@ -16,7 +16,7 @@ Modules
 rall : All methods.
 rbase : Base methods.
 rclient : Client methods.
-rdb : WeChatDatabase methods.
+rdb : Database methods.
 rcache : Cache methods.
 rlog : Log methods.
 rreceive : Receive methods.

reywechat/rbase.py

@@ -13,7 +13,7 @@ from reykit.rbase import Base, Error, Exit
 
 
 __all__ = (
-    'BaseWeChat',
+    'WeChatBase',
     'WeChatError',
     'WeChatClientErorr',
     'WeChatTriggerError',
@@ -22,19 +22,19 @@ __all__ = (
 )
 
 
-class BaseWeChat(Base):
+class WeChatBase(Base):
     """
     WeChat Base type.
     """
 
 
-class WeChatError(BaseWeChat, Error):
+class WeChatError(WeChatBase, Error):
     """
     WeChat error type.
     """
 
 
-class WeChatExit(BaseWeChat, Exit):
+class WeChatExit(WeChatBase, Exit):
     """
     WeChat exit type.
     """

reywechat/rcache.py

@@ -11,7 +11,7 @@
 
 from reykit.ros import FileCache, join_path
 
-from .rbase import BaseWeChat
+from .rbase import WeChatBase
 from .rwechat import WeChat
 
 
@@ -20,7 +20,7 @@ __all__ = (
 )
 
 
-class WeChatCache(BaseWeChat, FileCache):
+class WeChatCache(WeChatBase, FileCache):
     """
     WeChat file cache type.
     """

reywechat/rclient.py

@@ -17,7 +17,7 @@ from reykit.ros import find_relpath
 from reykit.rsys import run_cmd, search_process, memory_read, memory_write, popup_select
 from reykit.rtime import wait
 
-from .rbase import BaseWeChat, WeChatClientErorr
+from .rbase import WeChatBase, WeChatClientErorr
 from .rwechat import WeChat
 
 
@@ -42,7 +42,7 @@ CLIENT_VERSION_MEMORY_OFFSETS = (
 )
 
 
-class WeChatClient(BaseWeChat):
+class WeChatClient(WeChatBase):
     """
     WeChat client type.
     """
@@ -348,7 +348,7 @@ class WeChatClient(BaseWeChat):
             - `Key 'head_image'`: Head image URL.
             - `Key 'account_data_path'`: Current account data save path.
             - `Key 'wechat_data_path'`: WeChat data save path.
-            - `Key 'decrypt_key'`: WeChatDatabase decrypt key.
+            - `Key 'decrypt_key'`: Database decrypt key.
         """
 
         # Handle parameter.

reywechat/rdb.py

@@ -5,11 +5,11 @@
 @Time    : 2023-10-23 20:55:58
 @Author  : Rey
 @Contact : reyxbo@163.com
-@Explain : WeChatDatabase methods.
+@Explain : Database methods.
 """
 
 
-from typing import Any, Literal, overload
+from typing import Literal
 from json import loads as json_loads
 from reydb.rdb import Database
 from reykit.rbase import throw
@@ -17,7 +17,7 @@ from reykit.ros import File
 from reykit.rtime import to_time, time_to, sleep
 from reykit.rwrap import wrap_thread
 
-from .rbase import BaseWeChat
+from .rbase import WeChatBase
 from .rreceive import WeChatMessage
 from .rsend import WeChatSendTypeEnum, WeChatSendParameter
 from .rwechat import WeChat
@@ -28,7 +28,7 @@ __all__ = (
 )
 
 
-class WeChatDatabase(BaseWeChat):
+class WeChatDatabase(WeChatBase):
     """
     WeChat database type.
     Can create database used `self.build` method.
@@ -96,14 +96,14 @@ class WeChatDatabase(BaseWeChat):
         self.__start_from_message_send()
 
 
-    def build(self) -> None:
+    def build_db(self) -> None:
         """
         Check and build all standard databases and tables, by `self.db_names`.
         """
 
         # Set parameter.
 
-        ## WeChatDatabase.
+        ## Database.
         databases = [
             {
                 'name': self.db_names['wechat']
@@ -444,7 +444,7 @@ class WeChatDatabase(BaseWeChat):
                 'path': (self.db_names['wechat'], self.db_names['wechat.stats']),
                 'items': [
                     {
-                        'name': 'count_receive',
+                        'name': 'receive_count',
                         'select': (
                             'SELECT COUNT(1)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
@@ -452,7 +452,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Message receive count.'
                     },
                     {
-                        'name': 'count_send',
+                        'name': 'send_count',
                         'select': (
                             'SELECT COUNT(1)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`\n'
@@ -461,7 +461,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Message send count.'
                     },
                     {
-                        'name': 'count_user',
+                        'name': 'user_count',
                         'select': (
                             'SELECT COUNT(1)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`'
@@ -469,7 +469,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Contact user count.'
                     },
                     {
-                        'name': 'count_room',
+                        'name': 'room_count',
                         'select': (
                             'SELECT COUNT(1)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`'
@@ -477,7 +477,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Contact room count.'
                     },
                     {
-                        'name': 'count_room_user',
+                        'name': 'room_user_count',
                         'select': (
                             'SELECT COUNT(1)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`'
@@ -485,7 +485,142 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Contact room user count.'
                     },
                     {
-                        'name': 'last_time_receive',
+                        'name': 'past_day_receive_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Message receive count in the past day.'
+                    },
+                    {
+                        'name': 'past_day_send_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Message send count in the past day.'
+                    },
+                    {
+                        'name': 'past_day_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Contact user count in the past day.'
+                    },
+                    {
+                        'name': 'past_day_room_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Contact room count in the past day.'
+                    },
+                    {
+                        'name': 'past_day_room_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Contact room user count in the past day.'
+                    },
+                    {
+                        'name': 'past_week_receive_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Message receive count in the past week.'
+                    },
+                    {
+                        'name': 'past_week_send_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Message send count in the past week.'
+                    },
+                    {
+                        'name': 'past_week_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Contact user count in the past week.'
+                    },
+                    {
+                        'name': 'past_week_room_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Contact room count in the past week.'
+                    },
+                    {
+                        'name': 'past_week_room_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Contact room user count in the past week.'
+                    },
+                    {
+                        'name': 'past_month_receive_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Message receive count in the past month.'
+                    },
+                    {
+                        'name': 'past_month_send_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Message send count in the past month.'
+                    },
+                    {
+                        'name': 'past_month_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Contact user count in the past month.'
+                    },
+                    {
+                        'name': 'past_month_room_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Contact room count in the past month.'
+                    },
+                    {
+                        'name': 'past_month_room_user_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Contact room user count in the past month.'
+                    },
+                    {
+                        'name': 'receive_last_time',
                         'select': (
                             'SELECT MAX(`message_time`)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
@@ -493,7 +628,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Message last receive time.'
                     },
                     {
-                        'name': 'last_time_send',
+                        'name': 'send_last_time',
                         'select': (
                             'SELECT MAX(`status_time`)\n'
                             f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`\n'
@@ -502,6 +637,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': 'Message last send time.'
                     }
                 ]
+
             }
 
         ]
@@ -512,7 +648,7 @@ class WeChatDatabase(BaseWeChat):
         self.database_wechat.build.build(databases, tables, views_stats=views_stats)
 
         ## File.
-        self.database_file.file.build()
+        self.database_file.file.build_db()
 
         # Update.
         self.update_contact_user()

reywechat/rlog.py

@@ -12,7 +12,7 @@
 from reykit.rlog import Log
 from reykit.ros import Folder, join_path
 
-from .rbase import BaseWeChat
+from .rbase import WeChatBase
 from .rreceive import WeChatMessage
 from .rsend import WeChatSendParameter
 from .rwechat import WeChat
@@ -23,7 +23,7 @@ __all__ = (
 )
 
 
-class WeChatLog(BaseWeChat):
+class WeChatLog(WeChatBase):
     """
     WeChat log type.
     """
@@ -163,9 +163,9 @@ class WeChatLog(BaseWeChat):
             level = self.rrlog.INFO
         else:
             level = self.rrlog.ERROR
-            exc_report = '\n'.join(message.exc_reports)
-            content_print = '%s\n%s' % (content_print, exc_report)
-            content_file = '%s\n%s' % (content_file, exc_report)
+            exc_text = '\n'.join(message.exc_reports)
+            content_print = '%s\n%s' % (content_print, exc_text)
+            content_file = '%s\n%s' % (content_file, exc_text)
 
         ## Add color.
         if self.rrlog.print_colour:
@@ -205,9 +205,9 @@ class WeChatLog(BaseWeChat):
             level = self.rrlog.INFO
         else:
             level = self.rrlog.ERROR
-            exc_report = '\n'.join(send_param.exc_reports)
-            content_print = '%s\n%s' % (content_print, exc_report)
-            content_file = '%s\n%s' % (content_file, exc_report)
+            exc_text = '\n'.join(send_param.exc_reports)
+            content_print = '%s\n%s' % (content_print, exc_text)
+            content_file = '%s\n%s' % (content_file, exc_text)
 
         ## Add color.
         if self.rrlog.print_colour:

reywechat/rreceive.py

@@ -23,10 +23,10 @@ from reykit.rnet import listen_socket
 from reykit.ros import File, os_exists
 from reykit.rre import search, search_batch, findall
 from reykit.rtask import ThreadPool
-from reykit.rtime import sleep, wait
+from reykit.rtime import now, sleep, wait, to_time, time_to
 from reykit.rwrap import wrap_thread, wrap_exc
 
-from .rbase import BaseWeChat, WeChatTriggerError
+from .rbase import WeChatBase, WeChatTriggerError
 from .rsend import WeChatSendTypeEnum
 from .rwechat import WeChat
 
@@ -62,7 +62,7 @@ MessageParameter = TypedDict(
     )
 
 
-class WeChatMessage(BaseWeChat):
+class WeChatMessage(WeChatBase):
     """
     WeChat message type.
     """
@@ -94,6 +94,10 @@ class WeChatMessage(BaseWeChat):
         display : Message description text.
         data : Message source data.
         window : Message sende window ID.
+
+        Attributes
+        ----------
+        is_test : Whether add test text to before reply text.
         """
 
         # Import.
@@ -114,6 +118,7 @@ class WeChatMessage(BaseWeChat):
         self.trigger_break = self.receiver.trigger.break_
         self.replied: bool = False
         self.exc_reports: list[str] = []
+        self.is_test: bool = False
 
         ## Room and user.
         if self.window.endswith('chatroom'):
@@ -127,7 +132,6 @@ class WeChatMessage(BaseWeChat):
             self.user = self.window
 
         ## Cache.
-        self._window: str | None = None
         self._user_name: str | None = None
         self._room_name: str | None = None
         self._window_name: str | None = None
@@ -1060,10 +1064,25 @@ class WeChatMessage(BaseWeChat):
             text = 'can only be used by reply trigger'
             throw(WeChatTriggerError, self.trigger_rule, text=text)
 
+        # Test.
+        if (
+            self.is_test
+            and send_type in (WeChatSendTypeEnum.TEXT, WeChatSendTypeEnum.TEXT_AT)
+        ):
+            message_time = time_to(to_time(self.time).time())
+            receive_time = now('time_str')
+            send_time = ':time:'
+            test_text = f'{message_time} M\n{receive_time} R\n{send_time} S'
+            if params['text'] == '':
+                params['text'] = test_text
+            else:
+                params['text'] = f'{test_text}\n\n{params['text']}'
+            params['is_test'] = True
+
         # Status.
         self.replied = True
 
-        # Swend.
+        # Send.
         self.receiver.wechat.sender.send(
             send_type,
             receive_id=self.window,
@@ -1071,7 +1090,7 @@ class WeChatMessage(BaseWeChat):
         )
 
 
-class WechatReceiver(BaseWeChat):
+class WechatReceiver(WeChatBase):
     """
     WeChat receiver type.
     """
@@ -1201,17 +1220,17 @@ class WechatReceiver(BaseWeChat):
             # Handle.
 
             ## Define.
-            def handle_handler_exception(exc_report, *_) -> None:
+            def handle_handler_exception(exc_text, *_) -> None:
                 """
                 Handle Handler exception.
 
                 Parameters
                 ----------
-                exc_report : Exception report text.
+                exc_text : Exception report text.
                 """
 
                 # Save.
-                message.exc_reports.append(exc_report)
+                message.exc_reports.append(exc_text)
 
 
             ## Loop.

reywechat/rschedule.py

@@ -14,12 +14,12 @@ from typing import Any, Literal
 from collections.abc import Callable
 from reykit.rschedule import Schedule
 
-from .rbase import BaseWeChat
+from .rbase import WeChatBase
 from .rsend import WeChatSendTypeEnum
 from .rwechat import WeChat
 
 
-class WeChatSchedule(BaseWeChat):
+class WeChatSchedule(WeChatBase):
     """
     WeChat schedule type.
     """

reywechat/rsend.py

@@ -18,10 +18,10 @@ from queue import Queue
 from re import escape as re_escape
 from reykit.rbase import throw, catch_exc
 from reykit.rre import sub
-from reykit.rtime import sleep
+from reykit.rtime import now, sleep
 from reykit.rwrap import wrap_thread, wrap_exc
 
-from .rbase import BaseWeChat, WeChatTriggerContinueExit, WeChatTriggerBreakExit
+from .rbase import WeChatBase, WeChatTriggerContinueExit, WeChatTriggerBreakExit
 from .rwechat import WeChat
 
 
@@ -32,7 +32,7 @@ __all__ = (
 )
 
 
-class WeChatSendTypeEnum(BaseWeChat, IntEnum):
+class WeChatSendTypeEnum(WeChatBase, IntEnum):
     """
     WeChat send type enumeration type.
 
@@ -58,13 +58,13 @@ class WeChatSendTypeEnum(BaseWeChat, IntEnum):
     FORWARD = 7
 
 
-class WeChatSendStatusEnum(BaseWeChat, IntEnum):
+class WeChatSendStatusEnum(WeChatBase, IntEnum):
     """
     WeChat send status enumeration type.
 
     Attributes
     ----------
-    INIT : After initialization, before inserting into database queue.
+    INIT : After initialization, before inserting into the database queue.
     WAIT : After get from database queue, before sending.
     SENT : After sending.
     """
@@ -74,7 +74,7 @@ class WeChatSendStatusEnum(BaseWeChat, IntEnum):
     SENT = 2
 
 
-class WeChatSendParameter(BaseWeChat):
+class WeChatSendParameter(WeChatBase):
     """
     WeChat send parameters type.
     """
@@ -181,7 +181,7 @@ class WeChatSendParameter(BaseWeChat):
             - `Literal[WeChatSendTypeEnum.FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
         receive_id : User ID or chat room ID of receive message.
         send_id : Send ID of database.
-            - `None`: Not inserted into database.
+            - `None`: Not inserted into the database.
         params : Send parameters.
         """
 
@@ -195,7 +195,7 @@ class WeChatSendParameter(BaseWeChat):
         self.status: WeChatSendStatusEnum
 
 
-class WeChatSender(BaseWeChat):
+class WeChatSender(WeChatBase):
     """
     WeChat sender type.
 
@@ -247,7 +247,7 @@ class WeChatSender(BaseWeChat):
                     break
 
             send_param = self.queue.get()
-            handle_handler_exception = lambda exc_report, *_: send_param.exc_reports.append(exc_report)
+            handle_handler_exception = lambda exc_text, *_: send_param.exc_reports.append(exc_text)
 
             ## Handler.
             for handler in self.handlers:
@@ -259,13 +259,13 @@ class WeChatSender(BaseWeChat):
                 self.__send(send_param)
 
             ## Exception.
-            except:
+            except BaseException:
 
                 # Catch exception.
-                exc_report, *_ = catch_exc()
+                exc_text, *_ = catch_exc()
 
                 # Save.
-                send_param.exc_reports.append(exc_report)
+                send_param.exc_reports.append(exc_text)
 
             send_param.status = send_param.StatusEnum.SENT
 
@@ -290,6 +290,16 @@ class WeChatSender(BaseWeChat):
         send_param : `WeChatSendParameter` instance.
         """
 
+        # Test.
+        if (
+            send_param.params.get('is_test')
+            and send_param.send_type in (WeChatSendTypeEnum.TEXT, WeChatSendTypeEnum.TEXT_AT)
+        ):
+            text: str = send_param.params['text']
+            now_time = now('time_str')
+            modify_text = text.replace(':time:', now_time, 1)
+            send_param.params['text'] = modify_text
+
         # Send.
         match send_param.send_type:
 
@@ -453,7 +463,7 @@ class WeChatSender(BaseWeChat):
             **params
         )
         send_param.status = send_param.StatusEnum.INIT
-        handle_handler_exception = lambda exc_report, *_: send_param.exc_reports.append(exc_report)
+        handle_handler_exception = lambda exc_text, *_: send_param.exc_reports.append(exc_text)
 
         # Handler.
         for handler in self.handlers:
@@ -470,7 +480,7 @@ class WeChatSender(BaseWeChat):
     ) -> None:
         """
         Add send handler function.
-        Call at the after initialization, before inserting into database queue.
+        Call at the after initialization, before inserting into the database queue.
         Call at the after get from database queue, before sending.
         Call at the after sending.
         Can be use `WeChatSendParameter.status` judge status.
@@ -572,18 +582,18 @@ class WeChatSender(BaseWeChat):
                     *arg,
                     **kwargs
                 )
-            except:
-                *_, exc_instance, _ = catch_exc()
+            except BaseException:
+                *_, exc, _ = catch_exc()
 
                 # Report.
                 if not isinstance(
-                    exc_instance,
+                    exc,
                     (WeChatTriggerContinueExit, WeChatTriggerBreakExit)
                 ):
                     text = '\n'.join(
                         [
                             str(arg)
-                            for arg in exc_instance.args
+                            for arg in exc.args
                         ]
                     )
                     for receive_id in receive_ids:

reywechat/rtrigger.py

@@ -13,7 +13,7 @@ from typing import Any, TypedDict, NoReturn
 from collections.abc import Callable
 from reykit.rbase import catch_exc
 
-from .rbase import BaseWeChat, WeChatTriggerContinueExit, WeChatTriggerBreakExit
+from .rbase import WeChatBase, WeChatTriggerContinueExit, WeChatTriggerBreakExit
 from .rreceive import WeChatMessage, WechatReceiver
 
 
@@ -25,7 +25,7 @@ __all__ = (
 TriggerRule = TypedDict('TriggerRule', {'level': float, 'execute': Callable[[WeChatMessage], None], 'is_reply': bool})
 
 
-class WeChatTrigger(BaseWeChat):
+class WeChatTrigger(WeChatBase):
     """
     WeChat trigger type.
     """
@@ -98,13 +98,13 @@ class WeChatTrigger(BaseWeChat):
                     break
 
                 # Exception.
-                except:
+                except BaseException:
 
                     ## Catch exception.
-                    exc_report, *_ = catch_exc()
+                    exc_text, *_ = catch_exc()
 
                     ## Save.
-                    message.exc_reports.append(exc_report)
+                    message.exc_reports.append(exc_text)
 
                 finally:
                     message.trigger_rule = None

reywechat/rwechat.py

@@ -14,7 +14,7 @@ from os import getcwd as os_getcwd
 from reydb.rdb import Database
 from reykit.rbase import block
 
-from .rbase import BaseWeChat
+from .rbase import WeChatBase
 
 
 __all__ = (
@@ -22,7 +22,7 @@ __all__ = (
 )
 
 
-class WeChat(BaseWeChat):
+class WeChat(WeChatBase):
     """
     WeChat type.
 
@@ -109,7 +109,7 @@ class WeChat(BaseWeChat):
         self.wrap_try_send = self.sender.wrap_try_send
 
         ## Database.
-        self.database_build = self.database.build
+        self.database_build = self.database.build_db
 
         ## Schedule.
         self.schedule_add_task = self.schedule.add_task

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

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

reywechat-1.0.48.dist-info/RECORD

@@ -0,0 +1,17 @@
+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,,

reywechat-1.0.46.dist-info/RECORD

@@ -1,17 +0,0 @@
-reywechat/__init__.py,sha256=BL4PUpTguszJ612qsZf4-sOXxRIsiYRQ_m__FGMd1RQ,513
-reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
-reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
-reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
-reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
-reywechat/rdb.py,sha256=akIQsx4CZIt-H6kXWn2vpUYjo5MgD8MluzBMnSdmLaM,40051
-reywechat/rlog.py,sha256=IJL2WquiOYfB9iEai9xjojkuxPxiRHkdzZ5vCeaSA98,5261
-reywechat/rreceive.py,sha256=zANspJOxn2sQLW0CdA-vFsIeqG1OuVwDyytGM5LxQvQ,35483
-reywechat/rschedule.py,sha256=X9kreXdClTeItJHmNPJNqb_lct-BiLCyusMQxsj5hWU,1865
-reywechat/rsend.py,sha256=GfCv5O1-81r-o-RLzMMW_MQE99KwO9gZ3-93HaJ97W8,17595
-reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
-reywechat/rwechat.py,sha256=OcElINAi9jM-eDb_OTtseBW3kyG_3jD4V4QmltR6MeE,4874
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.46.dist-info/METADATA,sha256=R7vaJAjsObdA7VXgbOaB-Sj4k8kasY9i5EJhSg564JQ,1551
-reywechat-1.0.46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.46.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.46.dist-info/RECORD,,