reywechat 1.0.33__py3-none-any.whl → 1.0.35__py3-none-any.whl

reywechat/rdb.py

@@ -37,7 +37,7 @@ class WeChatDatabase(BaseWeChat):
     def __init__(
         self,
         wechat: WeChat,
-        rdatabase: Database | dict[Literal['wechat', 'file'], Database]
+        database: Database | dict[Literal['wechat', 'file'], Database]
     ) -> None:
         """
         Build instance attributes.
@@ -45,31 +45,42 @@ class WeChatDatabase(BaseWeChat):
         Parameters
         ----------
         wechat : `WeChatClient` instance.
-        rdatabase : `WeChatDatabase` instance of `reykit` package.
-            - `WeChatDatabase`, Set all `WeChatDatabase`: instances.
-            - `dict`, Set each `WeChatDatabase`: instance, all item is required.
-                `Key 'wechat'`: `WeChatDatabase` instance used in WeChat methods.
-                `Key 'file'`: `WeChatDatabase` instance used in file methods.
+        database : `Database` instance of `reykit` package.
+            - `Database`, Set all `Database`: instances.
+            - `dict`, Set each `Database`: instance, all item is required.
+                `Key 'wechat'`: `Database` instance used in WeChat methods.
+                `Key 'file'`: `Database` instance used in file methods.
         """
 
         # Set attribute.
         self.wechat = wechat
-        match rdatabase:
+        match database:
             case Database():
-                self.rdatabase_wechat = self.rdatabase_file = rdatabase
+                self.database_wechat = self.database_file = database
             case dict():
-                self.rdatabase_wechat: Database = rdatabase.get('wechat')
-                self.rdatabase_file: Database = rdatabase.get('file')
+                self.database_wechat: Database = database.get('wechat')
+                self.database_file: Database = database.get('file')
                 if (
-                    self.rdatabase_wechat
-                    or self.rdatabase_file
+                    self.database_wechat
+                    or self.database_file
                 ):
-                    throw(ValueError, rdatabase)
+                    throw(ValueError, database)
             case _:
-                throw(TypeError, rdatabase)
+                throw(TypeError, database)
+
+        ## Database path name.
+        self.path_names = {
+            'wechat': 'wechat',
+            'wechat.contact_user': 'contact_user',
+            'wechat.contact_room': 'contact_room',
+            'wechat.contact_room_user': 'contact_room_user',
+            'wechat.message_receive': 'message_receive',
+            'wechat.message_send': 'message_send',
+            'wechat.stats': 'stats'
+        }
 
         # Check.
-        if 'sqlite' in (self.rdatabase_wechat.backend, self.rdatabase_file.backend):
+        if 'sqlite' in (self.database_wechat.backend, self.database_file.backend):
             text='not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
@@ -89,7 +100,7 @@ class WeChatDatabase(BaseWeChat):
 
     def build(self) -> None:
         """
-        Check and build all standard databases and tables.
+        Check and build all standard databases and tables, by `self.path_names`.
         """
 
         # Set parameter.
@@ -97,7 +108,7 @@ class WeChatDatabase(BaseWeChat):
         ## WeChatDatabase.
         databases = [
             {
-                'database': 'wechat'
+                'name': self.path_names['wechat']
             }
         ]
 
@@ -106,7 +117,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_user'.
             {
-                'path': ('wechat', 'contact_user'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.contact_user']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -151,7 +162,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_room'.
             {
-                'path': ('wechat', 'contact_room'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.contact_room']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -196,7 +207,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_room_user'.
             {
-                'path': ('wechat', 'contact_room_user'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.contact_room_user']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -248,7 +259,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'message_receive'.
             {
-                'path': ('wechat', 'message_receive'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.message_receive']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -338,7 +349,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'message_send'.
             {
-                'path': ('wechat', 'message_send'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.message_send']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -436,7 +447,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'stats'.
             {
-                'path': ('wechat', 'stats'),
+                'path': (self.path_names['wechat'], self.path_names['wechat.stats']),
                 'items': [
                     {
                         'name': 'count_receive',
@@ -503,10 +514,10 @@ class WeChatDatabase(BaseWeChat):
         # Build.
 
         ## WeChat.
-        self.rdatabase_wechat.build.build(databases, tables, views_stats=views_stats)
+        self.database_wechat.build.build(databases, tables, views_stats=views_stats)
 
         ## File.
-        self.rdatabase_file.file.build()
+        self.database_file.file.build()
 
         # Update.
         self.update_contact_user()
@@ -536,12 +547,12 @@ class WeChatDatabase(BaseWeChat):
         ]
 
         # Insert and update.
-        conn = self.rdatabase_wechat.connect()
+        conn = self.database_wechat.connect()
 
         ## Insert.
         if contact_table != []:
             conn.execute_insert(
-                ('wechat', 'contact_user'),
+                (self.path_names['wechat'], self.path_names['wechat.contact_user']),
                 user_data,
                 'update'
             )
@@ -592,12 +603,12 @@ class WeChatDatabase(BaseWeChat):
         ]
 
         # Insert and update.
-        conn = self.rdatabase_wechat.connect()
+        conn = self.database_wechat.connect()
 
         ## Insert.
         if contact_table != []:
             conn.execute_insert(
-                ('wechat', 'contact_room'),
+                (self.path_names['wechat'], self.path_names['wechat.contact_room']),
                 room_data,
                 'update'
             )
@@ -670,12 +681,12 @@ class WeChatDatabase(BaseWeChat):
         ]
 
         # Insert and update.
-        conn = self.rdatabase_wechat.connect()
+        conn = self.database_wechat.connect()
 
         ## Insert.
         if room_user_data != []:
             conn.execute_insert(
-                ('wechat', 'contact_room_user'),
+                (self.path_names['wechat'], self.path_names['wechat.contact_room_user']),
                 room_user_data,
                 'update'
             )
@@ -742,8 +753,8 @@ class WeChatDatabase(BaseWeChat):
                 }
 
                 ## Insert.
-                self.rdatabase_wechat.execute_insert(
-                    ('wechat', 'contact_user'),
+                self.database_wechat.execute_insert(
+                    (self.path_names['wechat'], self.path_names['wechat.contact_user']),
                     data,
                     'update'
                 )
@@ -783,8 +794,8 @@ class WeChatDatabase(BaseWeChat):
                 ## Insert.
 
                 ### 'contact_room'.
-                self.rdatabase_wechat.execute_insert(
-                    ('wechat', 'contact_room'),
+                self.database_wechat.execute_insert(
+                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
                     data,
                     'update'
                 )
@@ -805,8 +816,8 @@ class WeChatDatabase(BaseWeChat):
                 }
 
                 ## Update.
-                self.rdatabase_wechat.execute_update(
-                    ('wechat', 'contact_room'),
+                self.database_wechat.execute_update(
+                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
                     data
                 )
 
@@ -827,8 +838,8 @@ class WeChatDatabase(BaseWeChat):
                 }
 
                 ## Update.
-                self.rdatabase_wechat.execute_update(
-                    ('wechat', 'contact_room'),
+                self.database_wechat.execute_update(
+                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
                     data
                 )
 
@@ -887,7 +898,7 @@ class WeChatDatabase(BaseWeChat):
             if message.file is None:
                 file_id = None
             else:
-                file_id = self.rdatabase_file.file.upload(
+                file_id = self.database_file.file.upload(
                     message.file['path'],
                     message.file['name'],
                     'WeChat'
@@ -907,8 +918,8 @@ class WeChatDatabase(BaseWeChat):
             }
 
             # Insert.
-            self.rdatabase_wechat.execute_insert(
-                ('wechat', 'message_receive'),
+            self.database_wechat.execute_insert(
+                (self.path_names['wechat'], self.path_names['wechat.message_receive']),
                 data,
                 'ignore'
             )
@@ -946,8 +957,8 @@ class WeChatDatabase(BaseWeChat):
             }
 
             # Update.
-            self.rdatabase_wechat.execute_update(
-                ('wechat', 'message_send'),
+            self.database_wechat.execute_update(
+                (self.path_names['wechat'], self.path_names['wechat.message_send']),
                 data
             )
 
@@ -973,7 +984,7 @@ class WeChatDatabase(BaseWeChat):
         """
 
         # Information.
-        file_info = self.rdatabase_file.file.query(file_id)
+        file_info = self.database_file.file.query(file_id)
         file_md5 = file_info['md5']
         file_name = file_info['name']
 
@@ -982,7 +993,7 @@ class WeChatDatabase(BaseWeChat):
 
         ## Download.
         if cache_path is None:
-            file_bytes = self.rdatabase_file.file.download(file_id)
+            file_bytes = self.database_file.file.download(file_id)
             cache_path = self.wechat.cache.store(file_bytes, file_name)
 
         return cache_path, file_name
@@ -1002,7 +1013,7 @@ class WeChatDatabase(BaseWeChat):
             """
 
             # Handle parameter.
-            conn = self.rdatabase_wechat.connect()
+            conn = self.database_wechat.connect()
 
             # Read.
             where = (
@@ -1015,7 +1026,7 @@ class WeChatDatabase(BaseWeChat):
                 ')'
             )
             result = conn.execute_select(
-                ('wechat', 'message_send'),
+                (self.path_names['wechat'], self.path_names['wechat.message_send']),
                 ['send_id', 'type', 'receive_id', 'parameter', 'file_id'],
                 where,
                 order='`plan_time` DESC, `send_id`'
@@ -1098,8 +1109,8 @@ class WeChatDatabase(BaseWeChat):
 
         ## User.
         if message.room is None:
-            result = message.receiver.wechat.database.rdatabase_wechat.execute_select(
-                ('wechat', 'contact_user'),
+            result = message.receiver.wechat.database.database_wechat.execute_select(
+                (self.path_names['wechat'], self.path_names['wechat.contact_user']),
                 ['valid'],
                 '`user_id` = :user_id',
                 limit=1,
@@ -1123,7 +1134,7 @@ class WeChatDatabase(BaseWeChat):
             ') AS `a`\n'
             'WHERE `valid` = 1'
             )
-            result = message.receiver.wechat.database.rdatabase_wechat.execute(
+            result = message.receiver.wechat.database.database_wechat.execute(
                 sql,
                 room_id=message.room,
                 user_id=message.user
@@ -1240,7 +1251,7 @@ class WeChatDatabase(BaseWeChat):
             ## Cache.
             cache_path = self.wechat.cache.store(file_path, file_name)
 
-            file_id = self.rdatabase_file.file.upload(
+            file_id = self.database_file.file.upload(
                 cache_path,
                 file_name,
                 'WeChat'
@@ -1250,7 +1261,7 @@ class WeChatDatabase(BaseWeChat):
         data['file_id'] = file_id
 
         # Insert.
-        self.rdatabase_wechat.execute_insert(
-            ('wechat', 'message_send'),
+        self.database_wechat.execute_insert(
+            (self.path_names['wechat'], self.path_names['wechat.message_send']),
             data
         )

reywechat/rwechat.py

@@ -40,7 +40,7 @@ class WeChat(BaseWeChat):
 
     def __init__(
         self,
-        rrdatabase: Database | dict[Literal['wechat', 'file'], Database] | None,
+        database: Database | dict[Literal['wechat', 'file'], Database] | None,
         max_receiver: int = 2,
         call_name: str | None = None,
         project_dir: str | None = None
@@ -50,11 +50,11 @@ class WeChat(BaseWeChat):
 
         Parameters
         ----------
-        rrdatabase : `WeChatDatabase` instance of `reykit` package.
-            - `WeChatDatabase`, Set all `WeChatDatabase`: instances.
-            - `dict`, Set each `WeChatDatabase`: instance, all item is required.
-                `Key 'wechat'`: `WeChatDatabase` instance used in WeChat methods.
-                `Key 'file'`: `WeChatDatabase` instance used in file methods.
+        database : `Database` instance of `reykit` package.
+            - `Database`, Set all `Database`: instances.
+            - `dict`, Set each `Database`: instance, all item is required.
+                `Key 'wechat'`: `Database` instance used in WeChat methods.
+                `Key 'file'`: `Database` instance used in file methods.
         max_receiver : Maximum number of receivers.
         call_name : Trigger call name.
             - `None`: Use account nickname.
@@ -82,7 +82,7 @@ class WeChat(BaseWeChat):
         self.receiver = WechatReceiver(self, max_receiver, call_name)
         self.trigger = self.receiver.trigger
         self.sender = WeChatSender(self)
-        self.database = WeChatDatabase(self, rrdatabase)
+        self.database = WeChatDatabase(self, database)
         self.schedule = WeChatSchedule(self)
 
         ## Client.

{reywechat-1.0.33.dist-info → reywechat-1.0.35.dist-info}/METADATA

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

{reywechat-1.0.33.dist-info → reywechat-1.0.35.dist-info}/RECORD

@@ -3,15 +3,15 @@ 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=euMCZBYz6b4Pw27zPUKYOwPHxK7g47pYfWFfNZMh0mU,40342
+reywechat/rdb.py,sha256=tknEavihcZ3-BYb29terhO8pE6s3t0NZABvUJoBdUTI,41464
 reywechat/rlog.py,sha256=x4WFLNoeKqGjPVoI81ZZNEd9ctdYToSg5hEFuESmCQY,5254
 reywechat/rreceive.py,sha256=RkUwPsWz6k_Ua3ovrbXRMVajeNOJQqvpPXz_CvJyUPQ,35162
 reywechat/rschedule.py,sha256=bZEEZV3K4zrJvupe1Eq6kGR7kunbVq5dfGnqFKYF3JI,1857
 reywechat/rsend.py,sha256=UmdKCOb1cPKEmBPHt9htjxB8fPyi5jW5pGwpRQIZdKA,13720
 reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
-reywechat/rwechat.py,sha256=d9yNnLLz0YI1buatf5j4YMhj6tUH6yWsDnx91EyAhow,4926
+reywechat/rwechat.py,sha256=Iir9EC0E3TmLElPf6k_Tkc7lZOr4uO1X9bpOZ0t0EV0,4884
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.33.dist-info/METADATA,sha256=iWpKAPaPOLLlLnmBv8bGRXGjDmlbMuVMLZtaqodYSQk,1551
-reywechat-1.0.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.33.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.33.dist-info/RECORD,,
+reywechat-1.0.35.dist-info/METADATA,sha256=XWhoKggz_4cP8rfJ9l0uMxB5--EyWWw0Zb8TsWT7YzI,1551
+reywechat-1.0.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.35.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.35.dist-info/RECORD,,