reywechat 1.0.28__py3-none-any.whl → 1.0.30__py3-none-any.whl

reywechat/rcache.py

@@ -9,7 +9,7 @@
 """
 
 
-from reykit.ros import FileCache
+from reykit.ros import FileCache, join_path
 
 from .rbase import BaseWeChat
 from .rwechat import WeChat
@@ -40,7 +40,8 @@ class WeChatCache(BaseWeChat, FileCache):
 
         # Set attribute.
         self.wechat = wechat
-        self.cache = FileCache(self.wechat.project_dir)
+        path = join_path(self.wechat.project_dir, 'cache')
+        self.cache = FileCache(path)
         self.folder = self.cache.folder
         self.index = self.cache.index
         self.store = self.cache.store

reywechat/rdb.py

@@ -13,7 +13,7 @@ from typing import Any, Literal, overload
 from json import loads as json_loads
 from reydb.rdb import Database
 from reykit.rbase import throw
-from reykit.ros import File, Folder
+from reykit.ros import File
 from reykit.rtime import to_time, time_to, sleep
 from reykit.rwrap import wrap_thread
 
@@ -56,7 +56,7 @@ class WeChatDatabase(BaseWeChat):
         self.wechat = wechat
         match rdatabase:
             case Database():
-                self.rdatabase_wechat: Database = self.rdatabase_file = rdatabase
+                self.rdatabase_wechat = self.rdatabase_file = rdatabase
             case dict():
                 self.rdatabase_wechat: Database = rdatabase.get('wechat')
                 self.rdatabase_file: Database = rdatabase.get('file')
@@ -1234,7 +1234,8 @@ class WeChatDatabase(BaseWeChat):
             if 'file_name' in params:
                 file_name: str = params.pop('file_name')
             else:
-                file_name = None
+                file = File(file_path)
+                file_name = file.name_suffix
 
             ## Cache.
             cache_path = self.wechat.cache.store(file_path, file_name)

reywechat/rlog.py

@@ -100,7 +100,7 @@ class WeChatLog(BaseWeChat):
         self.rrlog_print.add_print(format_=format_)
 
         ## Add handler file.
-        file_path = self.wechat.log.folder + 'wechat'
+        file_path = self.folder + 'wechat'
         self.rrlog_file.add_file(
             file_path,
             time='m',

reywechat/rreceive.py

@@ -16,10 +16,10 @@ from queue import Queue
 from json import loads as json_loads
 from bs4 import BeautifulSoup as BSBeautifulSoup
 from bs4.element import Tag as BSTag
-from reykit.rbase import throw, catch_exc
+from reykit.rbase import throw
 from reykit.rimage import decode_qrcode
 from reykit.rnet import listen_socket
-from reykit.ros import File, Folder, os_exists
+from reykit.ros import File, os_exists
 from reykit.rre import search, findall
 from reykit.rtask import ThreadPool
 from reykit.rtime import sleep, wait
@@ -133,6 +133,7 @@ class WeChatMessage(BaseWeChat):
         self._at_names: list[str] = None
         self._is_at: bool | None = None
         self._is_at_self: bool | None = None
+        self._is_call: bool | None = None
         self._is_new_user: bool | None = None
         self._is_new_room: bool | None = None
         self._is_new_room_user: bool | None = None
@@ -416,6 +417,8 @@ class WeChatMessage(BaseWeChat):
         pattern = r'@\w+\u2005'
         self._at_names = findall(pattern, text)
 
+        return self._at_names
+
 
     @property
     def is_at(self) -> bool:
@@ -458,6 +461,53 @@ class WeChatMessage(BaseWeChat):
         return self._is_at_self
 
 
+    @property
+    def is_call(self) -> bool:
+        """
+        Whether if is message of call self.
+
+        Returns
+        -------
+        Judge result.
+        """
+
+        # Cache.
+        if self._is_call is not None:
+            return self._is_call
+
+        # Judge.
+        is_call = False
+        if (
+
+            ## Private chat.
+            self.room is None
+
+            ## At self.
+            or self.is_at_self
+
+            ## Quote self.
+            or self.is_quote_self
+        ):
+            is_call = True
+
+        ## Call name.
+        if self.type == 1:
+            text = self.data
+        elif self.is_quote:
+            text = self.quote_params['text']
+        else:
+            self._is_call = False
+            return self._is_call
+        pattern = fr'^\s*{self.receiver.call_name}[\s,，]*(.*?)\s*$'
+        result: str | None = search(pattern, text)
+        if result is not None:
+            is_call = True
+
+        self._is_call = is_call
+
+        return self._is_call
+
+
     @property
     def is_new_user(self) -> bool:
         """
@@ -905,7 +955,8 @@ class WechatReceiver(BaseWeChat):
     def __init__(
         self,
         wechat: WeChat,
-        max_receiver: int
+        max_receiver: int,
+        call_name: str | None
     ) -> None:
         """
         Build instance attributes.
@@ -914,6 +965,8 @@ class WechatReceiver(BaseWeChat):
         ----------
         wechat : `WeChatClient` instance.
         max_receiver : Maximum number of receivers.
+        call_name : Trigger call name.
+            - `None`: Use account nickname.
         """
 
         # Import.
@@ -922,6 +975,9 @@ class WechatReceiver(BaseWeChat):
         # Set attribute.
         self.wechat = wechat
         self.max_receiver = max_receiver
+        if call_name is None:
+            call_name = self.wechat.client.login_info['name']
+        self.call_name = call_name
         self.queue: Queue[WeChatMessage] = Queue()
         self.handlers: list[Callable[[WeChatMessage], Any]] = []
         self.started: bool | None = False
@@ -1121,7 +1177,8 @@ class WechatReceiver(BaseWeChat):
             case 3:
                 pattern = r' md5="([\da-f]{32})"'
                 file_md5: str = search(pattern, message.data)
-                cache_path = self.wechat.cache.index(file_md5, copy=True)
+                file_name = f'{file_md5}.jpg'
+                cache_path = self.wechat.cache.index(file_md5, file_name, copy=True)
 
                 ### Download.
                 if cache_path is None:
@@ -1133,6 +1190,8 @@ class WechatReceiver(BaseWeChat):
 
             ## Voice.
             case 34:
+                file_name = None
+                file_name_suffix = 'amr'
                 cache_path = None
 
                 ### Download.
@@ -1146,7 +1205,8 @@ class WechatReceiver(BaseWeChat):
             case 43:
                 pattern = r' md5="([\da-f]{32})"'
                 file_md5: str = search(pattern, message.data)
-                cache_path = self.wechat.cache.index(file_md5, copy=True)
+                file_name = f'{file_md5}.mp4'
+                cache_path = self.wechat.cache.index(file_md5, file_name, copy=True)
 
                 ### Download.
                 if cache_path is None:
@@ -1197,15 +1257,18 @@ class WechatReceiver(BaseWeChat):
             sleep(0.2)
 
             ## Cache.
+            download_file = File(download_path)
+            if file_name is None:
+                file_name = f'{download_file.md5}.{file_name_suffix}'
             cache_path = self.wechat.cache.store(download_path, file_name, delete=True)
 
         # Set parameter.
-        file = File(cache_path)
+        cache_file = File(cache_path)
         message_file: MessageParameterFile = {
             'path': cache_path,
-            'name': file.name,
-            'md5': file.md5,
-            'size': file.size
+            'name': cache_file.name_suffix,
+            'md5': cache_file.md5,
+            'size': cache_file.size
         }
         message.file = message_file
 

reywechat/rsend.py

@@ -17,7 +17,6 @@ from functools import wraps as functools_wraps
 from queue import Queue
 from re import escape as re_escape
 from reykit.rbase import throw, catch_exc
-from reykit.ros import File
 from reykit.rre import sub
 from reykit.rtime import sleep
 from reykit.rwrap import wrap_thread, wrap_exc

reywechat/rwechat.py

@@ -13,7 +13,6 @@ from typing import Literal
 from os import getcwd as os_getcwd
 from reydb.rdb import Database
 from reykit.rbase import block
-from reykit.ros import Folder, join_path
 
 from .rbase import BaseWeChat
 
@@ -43,6 +42,7 @@ class WeChat(BaseWeChat):
         self,
         rrdatabase: Database | dict[Literal['wechat', 'file'], Database] | None,
         max_receiver: int = 2,
+        call_name: str | None = None,
         project_dir: str | None = None
     ) -> None:
         """
@@ -56,6 +56,8 @@ class WeChat(BaseWeChat):
                 `Key 'wechat'`: `WeChatDatabase` instance used in WeChat methods.
                 `Key 'file'`: `WeChatDatabase` instance used in file methods.
         max_receiver : Maximum number of receivers.
+        call_name : Trigger call name.
+            - `None`: Use account nickname.
         project_dir: Project directory, will create sub folders.
             - `None`: Use working directory.
             - `str`: Use this directory.
@@ -77,7 +79,7 @@ class WeChat(BaseWeChat):
         self.client = WeChatClient(self)
         self.cache = WeChatCache(self)
         self.log = WeChatLog(self)
-        self.receiver = WechatReceiver(self, max_receiver)
+        self.receiver = WechatReceiver(self, max_receiver, call_name)
         self.trigger = self.receiver.trigger
         self.sender = WeChatSender(self)
         self.database = WeChatDatabase(self, rrdatabase)
@@ -107,7 +109,7 @@ class WeChat(BaseWeChat):
         self.wrap_try_send = self.sender.wrap_try_send
 
         ## Database.
-        self.send = self.database.send
+        self.send = self.sender.send = self.database.send
 
         ## Schedule.
         self.schedule_add_task = self.schedule.add_task

{reywechat-1.0.28.dist-info → reywechat-1.0.30.dist-info}/METADATA

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

reywechat-1.0.30.dist-info/RECORD

@@ -0,0 +1,17 @@
+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=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
+reywechat/rdb.py,sha256=Gcj3d-uIospaacjHY8B4HHdru5OwiS9PO6cceAWvXqY,40333
+reywechat/rlog.py,sha256=d3S0eHMUZ92OLE7fjP3zzikIYANtnbAxhnE_DIV_1OY,5251
+reywechat/rreceive.py,sha256=VgDMNc_Lrnnm-eYinK-aCt1qXK1bEuyGYePSGrZtObk,32892
+reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
+reywechat/rsend.py,sha256=s2sR6l74reDShBAu_MwpavVunz0g42pIga0zX4ElIuI,13717
+reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
+reywechat/rwechat.py,sha256=igeG0XhfBN1BRQ9RDmYrPZIKdnIK2tmS05wb-eMdlzs,4923
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.30.dist-info/METADATA,sha256=ajAREqSPl0WJjajG78Ogwz7dftRrwy1-BtQykfUMqLg,1551
+reywechat-1.0.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.30.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.30.dist-info/RECORD,,

reywechat-1.0.28.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=yPGOaotZJ-Ps_6hKXm0jtQXAkdIEHLqr2nR-42syzmQ,856
-reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
-reywechat/rdb.py,sha256=WOIdaDp6KENu5Pq9Nbd4uZlSh_SV8SSWcGbL-mu3WZI,40299
-reywechat/rlog.py,sha256=zbdhPAL5fkJ0HKQuz9DBonJ1dxJ1N8GKROHvBmA6UaE,5262
-reywechat/rreceive.py,sha256=byrT8MeIKELDRd9CLakk1WfOvxvpMeMiv2SIdcfkLAE,31158
-reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
-reywechat/rsend.py,sha256=ShQLsKF6YXXD8SjixMFgqY1VGtIKt4f3odkXvP2dVDk,13746
-reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
-reywechat/rwechat.py,sha256=tsCwtZN7YVmgrHti0qVoifjC2XcIkjBYYWDK-ZP-YfM,4811
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.28.dist-info/METADATA,sha256=Brbyp2S4e_9JJg1mYEeioYkTvDCaOvSYWAV_ZkQv75Y,1551
-reywechat-1.0.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.28.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.28.dist-info/RECORD,,