reywechat 1.0.62__py3-none-any.whl → 1.0.64__py3-none-any.whl

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, WeChatSendStatusEnum, WeChatSendParameter
+from .rsend import WeChatSendTypeEnum, WeChatSendStatusEnum, WeChatSendParameters
 from .rwechat import WeChat
 
 
@@ -82,7 +82,7 @@ class WeChatDatabase(WeChatBase):
 
         # Check.
         if 'sqlite' in (self.database_wechat.backend, self.database_file.backend):
-            text='not suitable for SQLite databases'
+            text = 'not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Add handler.
@@ -101,6 +101,10 @@ class WeChatDatabase(WeChatBase):
         Check and build all standard databases and tables, by `self.db_names`.
         """
 
+        # Check.
+        if self.database_wechat is None:
+            throw(ValueError, self.database_wechat)
+
         # Set parameter.
 
         ## Database.
@@ -1090,26 +1094,26 @@ class WeChatDatabase(WeChatBase):
 
 
         # Define.
-        def sender_handler_update_send_status(send_param: WeChatSendParameter) -> None:
+        def sender_handler_update_send_status(send_params: WeChatSendParameters) -> None:
             """
             Update field `status` of table `message_send`.
 
             Parameters
             ----------
-            send_param : `WeChatSendParameter` instance.
+            send_params : `WeChatSendParameters` instance.
             """
 
             # Check.
-            if send_param.status != WeChatSendStatusEnum.SENT:
+            if send_params.status != WeChatSendStatusEnum.SENT:
                 return
 
             # Handle parameter.
-            if send_param.exc_reports == []:
+            if send_params.exc_reports == []:
                 status = 2
             else:
                 status = 3
             data = {
-                'send_id': send_param.send_id,
+                'send_id': send_params.send_id,
                 'status': status,
                 'limit': 1
             }
@@ -1222,15 +1226,15 @@ class WeChatDatabase(WeChatBase):
                     parameter['file_path'] = file_path
                     parameter['file_name'] = file_name
 
-                send_param = WeChatSendParameter(
+                send_params = WeChatSendParameters(
                     self.wechat.sender,
                     send_type,
                     receive_id,
                     send_id,
                     **parameter
                 )
-                send_param.status = WeChatSendStatusEnum.WAIT
-                self.wechat.sender.queue.put(send_param)
+                send_params.status = WeChatSendStatusEnum.WAIT
+                self.wechat.sender.queue.put(send_params)
 
             # Commit.
             conn.commit()
@@ -1315,21 +1319,21 @@ class WeChatDatabase(WeChatBase):
         return judge
 
 
-    def _insert_send(self, send_param: WeChatSendParameter) -> None:
+    def _insert_send(self, send_params: WeChatSendParameters) -> None:
         """
         Insert into `wechat.message_send` table of database, wait send.
 
         Parameters
         ----------
-        send_param : `WeChatSendParameter` instance.
+        send_params : `WeChatSendParameters` instance.
         """
 
         # Handle parameter.
-        params = send_param.params.copy()
+        params = send_params.params.copy()
         data = {
             'status': 0,
-            'type': send_param.send_type,
-            'receive_id': send_param.receive_id,
+            'type': send_params.send_type,
+            'receive_id': send_params.receive_id,
             'parameter': params
         }
 

reywechat/rlog.py

@@ -14,7 +14,7 @@ from reykit.ros import Folder, join_path
 
 from .rbase import WeChatBase
 from .rreceive import WeChatMessage
-from .rsend import WeChatSendParameter
+from .rsend import WeChatSendParameters
 from .rwechat import WeChat
 
 
@@ -185,27 +185,27 @@ class WeChatLog(WeChatBase):
 
     def log_send(
         self,
-        send_param: WeChatSendParameter
+        send_params: WeChatSendParameters
     ) -> None:
         """
         Log send message.
 
         Parameters
         ----------
-        send_param : `WeChatSendParameter` instance.
+        send_params : `WeChatSendParameters` instance.
         """
 
         # Generate record.
-        content_print = 'SEND    | %-20s' % send_param.receive_id
+        content_print = 'SEND    | %-20s' % send_params.receive_id
         content_file = 'SEND    | %s' % {
-            'receive_id': send_param.receive_id,
-            **send_param.params
+            'receive_id': send_params.receive_id,
+            **send_params.params
         }
-        if send_param.exc_reports == []:
+        if send_params.exc_reports == []:
             level = self.rrlog.INFO
         else:
             level = self.rrlog.ERROR
-            exc_text = '\n'.join(send_param.exc_reports)
+            exc_text = '\n'.join(send_params.exc_reports)
             content_print = '%s\n%s' % (content_print, exc_text)
             content_file = '%s\n%s' % (content_file, exc_text)
 

reywechat/rreceive.py

@@ -35,8 +35,8 @@ __all__ = (
 )
 
 
-MessageParameterFile = TypedDict(
-    'MessageParameterFile',
+MessageParametersFile = TypedDict(
+    'MessageParametersFile',
     {
         'path': str,
         'name': str,
@@ -44,8 +44,8 @@ MessageParameterFile = TypedDict(
         'size': int
     }
 )
-MessageParameter = TypedDict(
-    'MessageParameter',
+MessageParameters = TypedDict(
+    'MessageParameters',
     {
         'time': int,
         'id': int,
@@ -55,20 +55,20 @@ MessageParameter = TypedDict(
         'type': int,
         'display': str,
         'data': str,
-        'file': MessageParameterFile
+        'file': MessageParametersFile
     }
 )
-MessageShareParameter = TypedDict(
-    'MessageShareParameter',
+MessageShareParameters = TypedDict(
+    'MessageShareParameters',
     {
         'name': str | None,
         'title': str | None,
-        'des': str | None,
+        'desc': str | None,
         'url': str | None
     }
 )
-MessageQuoteParameter = TypedDict(
-    'MessageQuoteParameter',
+MessageQuoteParameters = TypedDict(
+    'MessageQuoteParameters',
     {
         'text': str,
         'quote_id': int,
@@ -132,7 +132,7 @@ class WeChatMessage(WeChatBase):
         self.display = display
         self.data = data
         self.window = window
-        self.file: MessageParameterFile | None = None
+        self.file: MessageParametersFile | None = None
         self.trigger_rule: TriggerRule | None = None
         self.trigger_continue = self.receiver.trigger.continue_
         self.trigger_break = self.receiver.trigger.break_
@@ -164,7 +164,7 @@ class WeChatMessage(WeChatBase):
 
         ### Share.
         self._share_type: int | None = None
-        self._share_params: MessageShareParameter | None = None
+        self._share_params: MessageShareParameters | None = None
         self._is_file_uploading: bool | None = None
         self._file_name_uploading: str | None = None
         self._is_file_uploaded: bool | None = None
@@ -206,7 +206,7 @@ class WeChatMessage(WeChatBase):
 
 
     @property
-    def params(self) -> MessageParameter:
+    def params(self) -> MessageParameters:
         """
         Return parameters dictionary.
 
@@ -216,7 +216,7 @@ class WeChatMessage(WeChatBase):
         """
 
         # Handle parameter.
-        params: MessageParameter = {
+        params: MessageParameters = {
             'time': self.time,
             'id': self.id,
             'number': self.number,
@@ -390,8 +390,8 @@ class WeChatMessage(WeChatBase):
                         self._text = '[转发聊天记录]'
                     else:
                         self._text = f'[转发"{self.share_params['title']}"]'
-                    if self.share_params['des'] is not None:
-                        self._text += f' {self.share_params['des']}'
+                    if self.share_params['desc'] is not None:
+                        self._text += f' {self.share_params['desc']}'
 
                 ### Mini program.
                 elif self.is_mini_program:
@@ -435,8 +435,8 @@ class WeChatMessage(WeChatBase):
                         self._text = f'[APP"{self.share_params['name']}"分享]'
                     if self.share_params["title"] is not None:
                         self._text += f' {self.share_params["title"]}'
-                    if self.share_params["des"] is not None:
-                        self._text += f' {self.share_params["des"]}'
+                    if self.share_params["desc"] is not None:
+                        self._text += f' {self.share_params["desc"]}'
 
                 ### Other.
                 else:
@@ -446,8 +446,8 @@ class WeChatMessage(WeChatBase):
                         self._text = f'["{self.share_params['name']}"分享]'
                     if self.share_params["title"] is not None:
                         self._text += f' {self.share_params["title"]}'
-                    if self.share_params["des"] is not None:
-                        self._text += f' {self.share_params["des"]}'
+                    if self.share_params["desc"] is not None:
+                        self._text += f' {self.share_params["desc"]}'
 
             ## Voice call or video call.
             case 50:
@@ -583,7 +583,7 @@ class WeChatMessage(WeChatBase):
 
 
     @property
-    def share_params(self) -> MessageShareParameter:
+    def share_params(self) -> MessageShareParameters:
         """
         Share message parameters.
 
@@ -607,14 +607,14 @@ class WeChatMessage(WeChatBase):
         if name is None:
             name: str | None = search('.*<nickname>([^<>]+)</nickname>', self.data)
         title: str | None = search('<title>([^<>]+)</title>', self.data)
-        des: str | None = search('.*<des>([^<>]+)</des>', self.data)
-        if des is None:
-            des: str | None = search('.*<desc>([^<>]+)</desc>', self.data)
+        desc: str | None = search('.*<des>([^<>]+)</des>', self.data)
+        if desc is None:
+            desc: str | None = search('.*<desc>([^<>]+)</desc>', self.data)
         url: str | None = search('.*<url>([^<>]+)</url>', self.data)
-        self._share_params: MessageShareParameter = {
+        self._share_params: MessageShareParameters = {
             'name': name,
             'title': title,
-            'des': des,
+            'desc': desc,
             'url': url
         }
 
@@ -784,7 +784,7 @@ class WeChatMessage(WeChatBase):
 
 
     @property
-    def quote_params(self) -> MessageQuoteParameter:
+    def quote_params(self) -> MessageQuoteParameters:
         """
         Quote message parameters.
 
@@ -826,7 +826,7 @@ class WeChatMessage(WeChatBase):
         quote_user_name: str = search(pattern, self.data)
         pattern = '<content>([^<>]+)</content>'
         quote_data: str = search(pattern, self.data)
-        self._quote_params: MessageQuoteParameter = {
+        self._quote_params: MessageQuoteParameters = {
             'text': text,
             'quote_id': quote_id,
             'quote_time': quote_time,
@@ -1938,7 +1938,7 @@ class WechatReceiver(WeChatBase):
 
         # Set parameter.
         cache_file = File(cache_path)
-        message_file: MessageParameterFile = {
+        message_file: MessageParametersFile = {
             'path': cache_path,
             'name': cache_file.name_suffix,
             'md5': cache_file.md5,

reywechat/rsend.py

@@ -27,7 +27,7 @@ from .rwechat import WeChat
 
 __all__ = (
     'WeChatSendTypeEnum',
-    'WeChatSendParameter',
+    'WeChatSendParameters',
     'WeChatSender'
 )
 
@@ -74,7 +74,7 @@ class WeChatSendStatusEnum(WeChatBase, IntEnum):
     SENT = 2
 
 
-class WeChatSendParameter(WeChatBase):
+class WeChatSendParameters(WeChatBase):
     """
     WeChat send parameters type.
     """
@@ -285,8 +285,8 @@ class WeChatSender(WeChatBase):
 
         # Set attribute.
         self.wechat = wechat
-        self.queue: Queue[WeChatSendParameter] = Queue()
-        self.handlers: list[Callable[[WeChatSendParameter], Any]] = []
+        self.queue: Queue[WeChatSendParameters] = Queue()
+        self.handlers: list[Callable[[WeChatSendParameters], Any]] = []
         self.started: bool | None = False
 
         # Start.
@@ -313,17 +313,17 @@ class WeChatSender(WeChatBase):
                 case None:
                     break
 
-            send_param = self.queue.get()
-            handle_handler_exception = lambda exc_text, *_: send_param.exc_reports.append(exc_text)
+            send_params = self.queue.get()
+            handle_handler_exception = lambda exc_text, *_: send_params.exc_reports.append(exc_text)
 
             ## Handler.
             for handler in self.handlers:
                 handler = wrap_exc(handler, handler=handle_handler_exception)
-                handler(send_param)
+                handler(send_params)
 
             ## Send.
             try:
-                self.__send(send_param)
+                self.__send(send_params)
 
             ## Exception.
             except BaseException:
@@ -332,104 +332,104 @@ class WeChatSender(WeChatBase):
                 exc_text, *_ = catch_exc()
 
                 # Save.
-                send_param.exc_reports.append(exc_text)
+                send_params.exc_reports.append(exc_text)
 
-            send_param.status = WeChatSendStatusEnum.SENT
+            send_params.status = WeChatSendStatusEnum.SENT
 
             ## Handler.
             for handler in self.handlers:
                 handler = wrap_exc(handler, handler=handle_handler_exception)
-                handler(send_param)
+                handler(send_params)
 
             ## Log.
-            self.wechat.error.log_send(send_param)
+            self.wechat.error.log_send(send_params)
 
 
     def __send(
         self,
-        send_param: WeChatSendParameter
+        send_params: WeChatSendParameters
     ) -> None:
         """
         Send message.
 
         Parameters
         ----------
-        send_param : `WeChatSendParameter` instance.
+        send_params : `WeChatSendParameters` instance.
         """
 
         # Test.
         if (
-            send_param.params.get('is_test')
-            and send_param.send_type in (WeChatSendTypeEnum.TEXT, WeChatSendTypeEnum.TEXT_AT)
+            send_params.params.get('is_test')
+            and send_params.send_type in (WeChatSendTypeEnum.TEXT, WeChatSendTypeEnum.TEXT_AT)
         ):
-            text: str = send_param.params['text']
+            text: str = send_params.params['text']
             now_time = now('time_str')
             modify_text = text.replace(':time:', now_time, 1)
-            send_param.params['text'] = modify_text
+            send_params.params['text'] = modify_text
 
         # Send.
-        match send_param.send_type:
+        match send_params.send_type:
 
             ## Text.
             case WeChatSendTypeEnum.TEXT:
                 self.wechat.client.send_text(
-                    send_param.receive_id,
-                    send_param.params['text']
+                    send_params.receive_id,
+                    send_params.params['text']
                 )
 
             ## Text with '@'.
             case WeChatSendTypeEnum.TEXT_AT:
                 self.wechat.client.send_text_at(
-                    send_param.receive_id,
-                    send_param.params['user_id'],
-                    send_param.params['text']
+                    send_params.receive_id,
+                    send_params.params['user_id'],
+                    send_params.params['text']
                 )
 
             ## File.
             case WeChatSendTypeEnum.FILE:
                 self.wechat.client.send_file(
-                    send_param.receive_id,
-                    send_param.params['file_path']
+                    send_params.receive_id,
+                    send_params.params['file_path']
                 )
 
             ## Image.
             case WeChatSendTypeEnum.IMAGE:
                 self.wechat.client.send_image(
-                    send_param.receive_id,
-                    send_param.params['file_path']
+                    send_params.receive_id,
+                    send_params.params['file_path']
                 )
 
             ## Emotion.
             case WeChatSendTypeEnum.EMOTION:
                 self.wechat.client.send_emotion(
-                    send_param.receive_id,
-                    send_param.params['file_path']
+                    send_params.receive_id,
+                    send_params.params['file_path']
                 )
 
             ## Pat.
             case WeChatSendTypeEnum.PAT:
                 self.wechat.client.send_pat(
-                    send_param.receive_id,
-                    send_param.params['user_id']
+                    send_params.receive_id,
+                    send_params.params['user_id']
                 )
 
             ## Public account.
             case WeChatSendTypeEnum.PUBLIC:
                 self.wechat.client.send_public(
-                    send_param.receive_id,
-                    send_param.params['page_url'],
-                    send_param.params['title'],
-                    send_param.params['text'],
-                    send_param.params['image_url'],
-                    send_param.params['public_name'],
-                    send_param.params['public_id']
+                    send_params.receive_id,
+                    send_params.params['page_url'],
+                    send_params.params['title'],
+                    send_params.params['text'],
+                    send_params.params['image_url'],
+                    send_params.params['public_name'],
+                    send_params.params['public_id']
                 )
 
             ## Forward.
             case WeChatSendTypeEnum.FORWARD:
                 self.wechat.client.send_forward(
-                    send_param.receive_id,
-                    send_param.params['message_id']
+                    send_params.receive_id,
+                    send_params.params['message_id']
                 )
 
             ## Throw exception.
@@ -523,38 +523,38 @@ class WeChatSender(WeChatBase):
         """
 
         # Handle parameter.
-        send_param = WeChatSendParameter(
+        send_params = WeChatSendParameters(
             self,
             send_type,
             receive_id,
             **params
         )
-        send_param.status = WeChatSendStatusEnum.INIT
-        handle_handler_exception = lambda exc_text, *_: send_param.exc_reports.append(exc_text)
+        send_params.status = WeChatSendStatusEnum.INIT
+        handle_handler_exception = lambda exc_text, *_: send_params.exc_reports.append(exc_text)
 
         # Handler.
         for handler in self.handlers:
             handler = wrap_exc(handler, handler=handle_handler_exception)
-            handler(send_param)
+            handler(send_params)
 
         # Insert.
-        self.wechat.database._insert_send(send_param)
+        self.wechat.database._insert_send(send_params)
 
 
     def add_handler(
         self,
-        handler: Callable[[WeChatSendParameter], Any]
+        handler: Callable[[WeChatSendParameters], Any]
     ) -> None:
         """
         Add send handler function.
         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.
+        Can be use `WeChatSendParameters.status` judge status.
 
         Parameters
         ----------
-        handler : Handler method, input parameter is `WeChatSendParameter` instance.
+        handler : Handler method, input parameter is `WeChatSendParameters` instance.
         """
 
         # Add.

{reywechat-1.0.62.dist-info → reywechat-1.0.64.dist-info}/METADATA

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

{reywechat-1.0.62.dist-info → reywechat-1.0.64.dist-info}/RECORD

@@ -3,14 +3,14 @@ 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=PBEg_9Ig07vwqH3RNLaIWZZD7Joe6MQceiNB21hGAj0,48654
-reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=akRLA5j17ySLEUG5HnlYy4PSboQgHay9AcLapJrJM9k,51206
-reywechat/rsend.py,sha256=yrJf9GzWVCDptUHHazhWSVW0nm2LCIbb0sz2EII63bY,20049
+reywechat/rdb.py,sha256=qQe8WrD-nwa8FkYeDeKXrxy7slnVXGy3lJ2V2tWleCY,48790
+reywechat/rlog.py,sha256=TSA-_5pwlq0sUND2cnLDqXvdmAdMAkC7tXIz3WfJ7Xw,5259
+reywechat/rreceive.py,sha256=74Re0rrNXPJ2idTUP69eK0wT93pGEN1c39pzyzctHa8,51236
+reywechat/rsend.py,sha256=BB42r24x37V1tb27HLhnB_2tILv-DW26F9QbhqiNes8,20101
 reywechat/rtrigger.py,sha256=WdOQwobPdGPyyE9J-qtQFPd60713T0aWqKk02PLdCRE,4966
 reywechat/rwechat.py,sha256=g0pbprMPv_qWb_lGFrPDAWsJO4vPSIgFLkw0Y28CZUo,4751
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.62.dist-info/METADATA,sha256=7ln3X4XFfA0qjt-kuQzH2dev6D79Qls8BWilRvdTqoM,1551
-reywechat-1.0.62.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.62.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.62.dist-info/RECORD,,
+reywechat-1.0.64.dist-info/METADATA,sha256=UfZn0zrWNu4cM1sPvLunFEzMo4_w3XNhXD6-6V4oHV0,1551
+reywechat-1.0.64.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.64.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.64.dist-info/RECORD,,