reywechat 1.0.27__py3-none-any.whl → 1.0.29__py3-none-any.whl

reywechat/__init__.py

@@ -17,6 +17,7 @@ rall : All methods.
 rbase : Base methods.
 rclient : Client methods.
 rdb : WeChatDatabase methods.
+rcache : Cache methods.
 rlog : Log methods.
 rreceive : Receive methods.
 rschedule : Schedule methods.

reywechat/rall.py

@@ -10,6 +10,7 @@
 
 
 from .rbase import *
+from .rcache import *
 from .rclient import *
 from .rdb import *
 from .rlog import *

reywechat/rcache.py

@@ -0,0 +1,47 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-08-13 22:58:31
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Cache methods.
+"""
+
+
+from reykit.ros import FileCache, join_path
+
+from .rbase import BaseWeChat
+from .rwechat import WeChat
+
+
+__all__ = (
+    'WeChatCache',
+)
+
+
+class WeChatCache(BaseWeChat, FileCache):
+    """
+    WeChat file cache type.
+    """
+
+
+    def __init__(
+        self,
+        wechat: WeChat
+    ) -> None:
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        wechat : `WeChatClient` instance.
+        """
+
+        # Set attribute.
+        self.wechat = wechat
+        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 Folder
+from reykit.ros import File
 from reykit.rtime import to_time, time_to, sleep
 from reykit.rwrap import wrap_thread
 
@@ -58,8 +58,8 @@ class WeChatDatabase(BaseWeChat):
             case Database():
                 self.rdatabase_wechat = self.rdatabase_file = rdatabase
             case dict():
-                self.rdatabase_wechat = rdatabase.get('wechat')
-                self.rdatabase_file = rdatabase.get('file')
+                self.rdatabase_wechat: Database = rdatabase.get('wechat')
+                self.rdatabase_file: Database = rdatabase.get('file')
                 if (
                     self.rdatabase_wechat
                     or self.rdatabase_file
@@ -972,26 +972,18 @@ class WeChatDatabase(BaseWeChat):
         File save path and file name.
         """
 
-        # Select.
+        # Information.
         file_info = self.rdatabase_file.file.query(file_id)
-        file_name = file_info['name']
         file_md5 = file_info['md5']
+        file_name = file_info['name']
 
-        # Check.
-        rfolder = Folder(self.wechat.dir_cache)
-        pattern = f'^{file_md5}$'
-        cache_path = rfolder.search(pattern)
+        # Cache.
+        cache_path = self.wechat.cache.index(file_md5, file_name, True)
 
-        # Download.
+        ## Download.
         if cache_path is None:
-            cache_path = '%s/%s' % (
-                self.wechat.dir_cache,
-                file_md5
-            )
-            self.rdatabase_file.file.download(
-                file_id,
-                cache_path
-            )
+            file_bytes = self.rdatabase_file.file.download(file_id)
+            cache_path = self.wechat.cache.store(file_bytes, file_name)
 
         return cache_path, file_name
 
@@ -1055,7 +1047,7 @@ class WeChatDatabase(BaseWeChat):
                 send_type = WeChatSendEnum(type_)
                 parameter: dict = json_loads(parameter)
 
-                ## Save file.
+                ## File.
                 if file_id is not None:
                     file_path, file_name = self.__download_file(file_id)
                     parameter['file_path'] = file_path
@@ -1242,9 +1234,14 @@ 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)
+
             file_id = self.rdatabase_file.file.upload(
-                file_path,
+                cache_path,
                 file_name,
                 'WeChat'
             )

reywechat/rlog.py

@@ -9,8 +9,8 @@
 """
 
 
-from os.path import join as os_join
 from reykit.rlog import Log
+from reykit.ros import Folder, join_path
 
 from .rbase import BaseWeChat
 from .rreceive import WeChatMessage
@@ -44,6 +44,9 @@ class WeChatLog(BaseWeChat):
         # Set attribute.
         self.wechat = wechat
 
+        # Make directory.
+        self.folder = self.__make_dir()
+
         # Logger.
         self.rrlog = Log('WeChat')
         self.rrlog_print = Log('WeChat.WeChatPrint')
@@ -53,6 +56,29 @@ class WeChatLog(BaseWeChat):
         self.__add_handler()
 
 
+    def __make_dir(self) -> Folder:
+        """
+        Make directory 'project_dir/log'.
+
+        Parameters
+        ----------
+        project_dir: Project directory.
+
+        Returns
+        -------
+        Folder instance.
+        """
+
+        # Set parameter.
+        dir_path = join_path(self.wechat.project_dir, 'log')
+
+        # Make.
+        folder = Folder(dir_path)
+        folder.make()
+
+        return folder
+
+
     def __add_handler(self) -> None:
         """
         Add log handler.
@@ -74,7 +100,7 @@ class WeChatLog(BaseWeChat):
         self.rrlog_print.add_print(format_=format_)
 
         ## Add handler file.
-        file_path = os_join(self.wechat.dir_log, 'WeChat')
+        file_path = self.folder + 'wechat'
         self.rrlog_file.add_file(
             file_path,
             time='m',

reywechat/rreceive.py

@@ -12,15 +12,14 @@
 from __future__ import annotations
 from typing import Any, TypedDict, Literal, overload
 from collections.abc import Callable
-from os.path import join as os_join
 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
@@ -417,6 +416,8 @@ class WeChatMessage(BaseWeChat):
         pattern = r'@\w+\u2005'
         self._at_names = findall(pattern, text)
 
+        return self._at_names
+
 
     @property
     def is_at(self) -> bool:
@@ -1116,68 +1117,47 @@ class WechatReceiver(BaseWeChat):
         """
 
         # Download.
-        folder = Folder(self.wechat.dir_cache)
-        generate_path = None
         match message.type:
 
             ## Image.
             case 3:
-                ### Get attribute.
-                file_name = f'{message.id}.jpg'
-                pattern = r'length="(\d+)".*?md5="([\da-f]{32})"'
-                result: tuple[str, str] = search(pattern, message.data)
-                file_size, file_md5 = result
-                file_size = int(file_size)
-
-                ### Exist.
-                pattern = f'^{file_md5}$'
-                cache_path = folder.search(pattern)
-
-                ### Generate.
+                pattern = r' md5="([\da-f]{32})"'
+                file_md5: str = search(pattern, message.data)
+                file_name = f'{file_md5}.jpg'
+                cache_path = self.wechat.cache.index(file_md5, file_name, copy=True)
+
+                ### Download.
                 if cache_path is None:
                     self.wechat.client.download_file(message.id)
-                    generate_path = '%swxhelper/image/%s.dat' % (
+                    download_path = '%swxhelper/image/%s.dat' % (
                         self.wechat.client.login_info['account_data_path'],
                         message.id
                     )
 
             ## Voice.
             case 34:
+                file_name = None
+                file_name_suffix = 'amr'
+                cache_path = None
 
-                ### Get attribute.
-                file_name = f'{message.id}.amr'
-                pattern = r'length="(\d+)"'
-                file_size = int(search(pattern, message.data))
-                file_md5 = None
-
-                ### Generate.
+                ### Download.
                 self.wechat.client.download_voice(
                     message.id,
-                    self.wechat.dir_cache
-                )
-                generate_path = '%s/%s.amr' % (
-                    self.wechat.dir_cache,
-                    message.id
+                    self.wechat.cache.folder.path
                 )
+                download_path = self.wechat.cache.folder + f'{message.id}.amr'
 
             ## Video.
             case 43:
+                pattern = r' md5="([\da-f]{32})"'
+                file_md5: str = search(pattern, message.data)
+                file_name = f'{file_md5}.mp4'
+                cache_path = self.wechat.cache.index(file_md5, file_name, copy=True)
 
-                ### Get attribute.
-                file_name = f'{message.id}.mp4'
-                pattern = r'length="(\d+)"'
-                file_size = int(search(pattern, message.data))
-                pattern = r'md5="([\da-f]{32})"'
-                file_md5 = search(pattern, message.data)
-
-                ### Exist.
-                pattern = f'^{file_md5}$'
-                cache_path = folder.search(pattern)
-
-                ### Generate.
+                ### Download.
                 if cache_path is None:
                     self.wechat.client.download_file(message.id)
-                    generate_path = '%swxhelper/video/%s.mp4' % (
+                    download_path = '%swxhelper/video/%s.mp4' % (
                         self.wechat.client.login_info['account_data_path'],
                         message.id
                     )
@@ -1187,26 +1167,21 @@ class WechatReceiver(BaseWeChat):
 
                 ### Check.
                 pattern = r'^.+? : \[文件\](.+)$'
-                file_name = search(pattern, message.display)
-                if file_name is None:
-                    return
-                if '<type>6</type>' not in message.data:
+                file_name: str | None = search(pattern, message.display)
+                if (
+                    file_name is None
+                    or '<type>6</type>' not in message.data
+                ):
                     return
 
-                ### Get attribute.
-                pattern = r'<totallen>(\d+)</totallen>'
-                file_size = int(search(pattern, message.data))
                 pattern = r'<md5>([\da-f]{32})</md5>'
-                file_md5 = search(pattern, message.data)
-
-                ### Exist.
-                pattern = f'^{file_md5}$'
-                cache_path = folder.search(pattern)
+                file_md5: str = search(pattern, message.data)
+                cache_path = self.wechat.cache.index(file_md5, file_name, copy=True)
 
-                ### Generate.
+                ### Download.
                 if cache_path is None:
                     self.wechat.client.download_file(message.id)
-                    generate_path = '%swxhelper/file/%s_%s' % (
+                    download_path = '%swxhelper/file/%s_%s' % (
                         self.wechat.client.login_info['account_data_path'],
                         message.id,
                         file_name
@@ -1216,35 +1191,32 @@ class WechatReceiver(BaseWeChat):
             case _:
                 return
 
-        if generate_path is not None:
+        if cache_path is None:
 
             ## Wait.
             wait(
                 os_exists,
-                generate_path,
+                download_path,
                 _interval = 0.05,
                 _timeout=3600
             )
             sleep(0.2)
 
-            ## Move.
-            rfile = File(generate_path)
-            if file_md5 is None:
-                file_md5 = rfile.md5
-                pattern = f'^{file_md5}$'
-                cache_path = folder.search(pattern)
-            if cache_path is None:
-                cache_path = os_join(self.wechat.dir_cache, file_md5)
-                rfile.move(cache_path)
+            ## 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: MessageParameterFile = {
+        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 = file
+        message.file = message_file
 
 
     def start(self) -> None:

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
@@ -286,15 +285,6 @@ class WeChatSender(BaseWeChat):
         sendparam : `WeChatSendParameter` instance.
         """
 
-        # File rename to new.
-        if (
-            (file_path := sendparam.params.get('file_path')) is not None
-            and (file_name := sendparam.params.get('file_name')) is not None
-        ):
-            file = File(file_path)
-            file_old_name = file.name
-            file_path_rename = file.rename(file_name)
-
         # Send.
         match sendparam.send_type:
 
@@ -317,21 +307,21 @@ class WeChatSender(BaseWeChat):
             case WeChatSendEnum.SEND_FILE:
                 self.wechat.client.send_file(
                     sendparam.receive_id,
-                    file_path_rename
+                    sendparam.params['file_path']
                 )
 
             ## Image.
             case WeChatSendEnum.SEND_IMAGE:
                 self.wechat.client.send_image(
                     sendparam.receive_id,
-                    file_path_rename
+                    sendparam.params['file_path']
                 )
 
             ## Emotion.
             case WeChatSendEnum.SEND_EMOTION:
                 self.wechat.client.send_emotion(
                     sendparam.receive_id,
-                    file_path_rename
+                    sendparam.params['file_path']
                 )
 
             ## Pat.
@@ -364,15 +354,6 @@ class WeChatSender(BaseWeChat):
             case send_type:
                 throw(ValueError, send_type)
 
-        # File rename to old.
-        if (
-            file_path is not None
-            and file_name is not None
-        ):
-            sleep(1)
-            file = File(file_path_rename)
-            file.rename(file_old_name)
-
 
     def add_handler(
         self,

reywechat/rwechat.py

@@ -11,10 +11,8 @@
 
 from typing import Literal
 from os import getcwd as os_getcwd
-from os.path import join as os_join
 from reydb.rdb import Database
 from reykit.rbase import block
-from reykit.ros import make_dir as reykit_make_dir
 
 from .rbase import BaseWeChat
 
@@ -63,6 +61,7 @@ class WeChat(BaseWeChat):
         """
 
         # Import.
+        from .rcache import WeChatCache
         from .rclient import WeChatClient
         from .rdb import WeChatDatabase
         from .rlog import WeChatLog
@@ -70,14 +69,12 @@ class WeChat(BaseWeChat):
         from .rschedule import WeChatSchedule
         from .rsend import WeChatSender
 
-        # Make directory.
-        project_dir = project_dir or os_getcwd()
-        self.dir_cache, self.dir_log = self.__make_subdir(project_dir)
-
         # Set attribute.
+        self.project_dir = project_dir or os_getcwd()
 
         ## Instance.
         self.client = WeChatClient(self)
+        self.cache = WeChatCache(self)
         self.log = WeChatLog(self)
         self.receiver = WechatReceiver(self, max_receiver)
         self.trigger = self.receiver.trigger
@@ -109,7 +106,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
@@ -117,39 +114,6 @@ class WeChat(BaseWeChat):
         self.schedule_resume = self.schedule.resume
 
 
-    def __make_subdir(
-        self,
-        project_dir: str
-    ) -> tuple[str, str]:
-        """
-        Make project subdirectory, 'project_dir/cache' and 'project_dir/cache'.
-
-        Parameters
-        ----------
-        project_dir: Project directory.
-
-        Returns
-        -------
-        Subdirectorys path.
-        """
-
-        # Set parameter.
-        dir_names = (
-            'cache',
-            'log'
-        )
-        dir_dict = {
-            dir_name: os_join(project_dir, dir_name)
-            for dir_name in dir_names
-        }
-
-        # Create.
-        paths = dir_dict.values()
-        reykit_make_dir(*paths)
-
-        return dir_dict['cache'], dir_dict['log']
-
-
     def start(self) -> None:
         """
         Start all methods.

{reywechat-1.0.27.dist-info → reywechat-1.0.29.dist-info}/METADATA

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

reywechat-1.0.29.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=5emlgnIChYL60yx6PoQc1h5aGHFXNuFJ71a585gamEg,31550
+reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
+reywechat/rsend.py,sha256=s2sR6l74reDShBAu_MwpavVunz0g42pIga0zX4ElIuI,13717
+reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
+reywechat/rwechat.py,sha256=K9fwje_Sos3Pvke8tFexDNZsRD7FsLtH3Jktg9xREpk,4788
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.29.dist-info/METADATA,sha256=GQNNn2iqWueYDLoZuKQGnmmQqMgEJlBPAtqQeFY3U3s,1551
+reywechat-1.0.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.29.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.29.dist-info/RECORD,,

reywechat-1.0.27.dist-info/RECORD

@@ -1,16 +0,0 @@
-reywechat/__init__.py,sha256=CBcaezJsuYnBzunuzRoRwz-q_HDQq7XsGKtNxCWAQoY,488
-reywechat/rall.py,sha256=KAHdmzvrmDel_ttvZKR0tkfg21Amm3sKMvGJDkNA14U,374
-reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
-reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
-reywechat/rdb.py,sha256=JBrJw-Xev9BNogOg2G31-da80y7edpSjtAzFHZkDs3g,40313
-reywechat/rlog.py,sha256=rIl3fy1SFuAAiUnxVnOFJv-gK51AunDljJgsFUx6I50,4745
-reywechat/rreceive.py,sha256=pgo--mHTSpCtb_ScIreoiiWAtIVsqe2Tut88W7MrBc8,32403
-reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
-reywechat/rsend.py,sha256=q1stNggg40WPqI5h8_coAXsbFRM6M6dxsDxq2-L3CJs,14286
-reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
-reywechat/rwechat.py,sha256=Niu2TTyElpzXtb6fn-xzwa1QjkwrvLwFyP3U-2ALrl4,5595
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.27.dist-info/METADATA,sha256=Y9h0Dr56SY6w5krZ163ufW6FdT3-kgdUkOD5jw6O7JM,1551
-reywechat-1.0.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.27.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.27.dist-info/RECORD,,