reywechat 1.0.37__py3-none-any.whl → 1.0.39__py3-none-any.whl

reywechat/rdb.py

@@ -31,6 +31,7 @@ __all__ = (
 class WeChatDatabase(BaseWeChat):
     """
     WeChat database type.
+    Can create database used `self.build` method.
     """
 
 
@@ -69,7 +70,7 @@ class WeChatDatabase(BaseWeChat):
                 throw(TypeError, database)
 
         ## Database path name.
-        self.path_names = {
+        self.db_names = {
             'wechat': 'wechat',
             'wechat.contact_user': 'contact_user',
             'wechat.contact_room': 'contact_room',
@@ -84,9 +85,6 @@ class WeChatDatabase(BaseWeChat):
             text='not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
-        # Build.
-        self.build()
-
         # Add handler.
         self.__add_receiver_handler_to_contact_user()
         self.__add_receiver_handler_to_contact_room()
@@ -100,7 +98,7 @@ class WeChatDatabase(BaseWeChat):
 
     def build(self) -> None:
         """
-        Check and build all standard databases and tables, by `self.path_names`.
+        Check and build all standard databases and tables, by `self.db_names`.
         """
 
         # Set parameter.
@@ -108,7 +106,7 @@ class WeChatDatabase(BaseWeChat):
         ## WeChatDatabase.
         databases = [
             {
-                'name': self.path_names['wechat']
+                'name': self.db_names['wechat']
             }
         ]
 
@@ -117,7 +115,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_user'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.contact_user']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -162,7 +160,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_room'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.contact_room']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -207,7 +205,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'contact_room_user'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.contact_room_user']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.contact_room_user']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -259,7 +257,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'message_receive'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.message_receive']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.message_receive']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -349,7 +347,7 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'message_send'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.message_send']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.message_send']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -373,7 +371,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'send_id',
                         'type': 'int unsigned',
                         'constraint': 'NOT NULL AUTO_INCREMENT',
-                        'comment': 'Send self increase ID.'
+                        'comment': 'Send ID.'
                     },
                     {
                         'name': 'status',
@@ -440,6 +438,7 @@ class WeChatDatabase(BaseWeChat):
                 ],
                 'comment': 'Message send table.'
             }
+
         ]
 
         ## View stats.
@@ -447,13 +446,13 @@ class WeChatDatabase(BaseWeChat):
 
             ### 'stats'.
             {
-                'path': (self.path_names['wechat'], self.path_names['wechat.stats']),
+                'path': (self.db_names['wechat'], self.db_names['wechat.stats']),
                 'items': [
                     {
                         'name': 'count_receive',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`message_receive`'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
                         ),
                         'comment': 'Message receive count.'
                     },
@@ -461,7 +460,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_send',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`message_send`\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`\n'
                             'WHERE `status` = 2'
                         ),
                         'comment': 'Message send count.'
@@ -470,7 +469,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_user',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_user`'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`'
                         ),
                         'comment': 'Contact user count.'
                     },
@@ -478,7 +477,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_room',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_room`'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`'
                         ),
                         'comment': 'Contact room count.'
                     },
@@ -486,7 +485,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_room_user',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_room_user`'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`'
                         ),
                         'comment': 'Contact room user count.'
                     },
@@ -494,7 +493,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'last_time_receive',
                         'select': (
                             'SELECT MAX(`message_time`)\n'
-                            'FROM `wechat`.`message_receive`'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_receive']}`'
                         ),
                         'comment': 'Message last receive time.'
                     },
@@ -502,13 +501,14 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'last_time_send',
                         'select': (
                             'SELECT MAX(`status_time`)\n'
-                            'FROM `wechat`.`message_send`\n'
+                            f'FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`\n'
                             'WHERE `status` = 2'
                         ),
                         'comment': 'Message last send time.'
                     }
                 ]
             }
+
         ]
 
         # Build.
@@ -552,7 +552,7 @@ class WeChatDatabase(BaseWeChat):
         ## Insert.
         if contact_table != []:
             conn.execute_insert(
-                (self.path_names['wechat'], self.path_names['wechat.contact_user']),
+                (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                 user_data,
                 'update'
             )
@@ -560,12 +560,12 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if user_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_user`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`\n'
                 'SET `contact` = 0'
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_user`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_user']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE `user_id` NOT IN :user_ids'
             )
@@ -608,7 +608,7 @@ class WeChatDatabase(BaseWeChat):
         ## Insert.
         if contact_table != []:
             conn.execute_insert(
-                (self.path_names['wechat'], self.path_names['wechat.contact_room']),
+                (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                 room_data,
                 'update'
             )
@@ -616,12 +616,12 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if room_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_room`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`\n'
                 'SET `contact` = 0'
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_room`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE `room_id` NOT IN :room_ids'
             )
@@ -686,7 +686,7 @@ class WeChatDatabase(BaseWeChat):
         ## Insert.
         if room_user_data != []:
             conn.execute_insert(
-                (self.path_names['wechat'], self.path_names['wechat.contact_room_user']),
+                (self.db_names['wechat'], self.db_names['wechat.contact_room_user']),
                 room_user_data,
                 'update'
             )
@@ -694,18 +694,18 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if room_user_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0'
             )
         elif room_id is None:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0\n'
                 "WHERE CONCAT(`room_id`, ',', `user_id`) NOT IN :room_user_ids"
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE (\n'
                 '    `room_id` = :room_id\n'
@@ -754,7 +754,7 @@ class WeChatDatabase(BaseWeChat):
 
                 ## Insert.
                 self.database_wechat.execute_insert(
-                    (self.path_names['wechat'], self.path_names['wechat.contact_user']),
+                    (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                     data,
                     'update'
                 )
@@ -795,7 +795,7 @@ class WeChatDatabase(BaseWeChat):
 
                 ### 'contact_room'.
                 self.database_wechat.execute_insert(
-                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
+                    (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data,
                     'update'
                 )
@@ -817,7 +817,7 @@ class WeChatDatabase(BaseWeChat):
 
                 ## Update.
                 self.database_wechat.execute_update(
-                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
+                    (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data
                 )
 
@@ -839,7 +839,7 @@ class WeChatDatabase(BaseWeChat):
 
                 ## Update.
                 self.database_wechat.execute_update(
-                    (self.path_names['wechat'], self.path_names['wechat.contact_room']),
+                    (self.db_names['wechat'], self.db_names['wechat.contact_room']),
                     data
                 )
 
@@ -919,7 +919,7 @@ class WeChatDatabase(BaseWeChat):
 
             # Insert.
             self.database_wechat.execute_insert(
-                (self.path_names['wechat'], self.path_names['wechat.message_receive']),
+                (self.db_names['wechat'], self.db_names['wechat.message_receive']),
                 data,
                 'ignore'
             )
@@ -958,7 +958,7 @@ class WeChatDatabase(BaseWeChat):
 
             # Update.
             self.database_wechat.execute_update(
-                (self.path_names['wechat'], self.path_names['wechat.message_send']),
+                (self.db_names['wechat'], self.db_names['wechat.message_send']),
                 data
             )
 
@@ -1026,7 +1026,7 @@ class WeChatDatabase(BaseWeChat):
                 ')'
             )
             result = conn.execute_select(
-                (self.path_names['wechat'], self.path_names['wechat.message_send']),
+                (self.db_names['wechat'], self.db_names['wechat.message_send']),
                 ['send_id', 'type', 'receive_id', 'parameter', 'file_id'],
                 where,
                 order='`plan_time` DESC, `send_id`'
@@ -1043,7 +1043,7 @@ class WeChatDatabase(BaseWeChat):
                 for row in table
             ]
             sql = (
-                'UPDATE `wechat`.`message_send`\n'
+                f'UPDATE `{self.db_names['wechat']}`.`{self.db_names['wechat.message_send']}`\n'
                 'SET `status` = 1\n'
                 'WHERE `send_id` IN :send_ids'
             )
@@ -1110,7 +1110,7 @@ class WeChatDatabase(BaseWeChat):
         ## User.
         if message.room is None:
             result = message.receiver.wechat.database.database_wechat.execute_select(
-                (self.path_names['wechat'], self.path_names['wechat.contact_user']),
+                (self.db_names['wechat'], self.db_names['wechat.contact_user']),
                 ['valid'],
                 '`user_id` = :user_id',
                 limit=1,
@@ -1122,13 +1122,13 @@ class WeChatDatabase(BaseWeChat):
             sql = (
             'SELECT (\n'
             '    SELECT `valid`\n'
-            '    FROM `wechat`.`contact_room_user`\n'
+            f'    FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room_user']}`\n'
             '    WHERE `room_id` = :room_id AND `user_id` = :user_id\n'
             '    LIMIT 1\n'
             ') AS `valid`\n'
             'FROM (\n'
             '    SELECT `valid`\n'
-            '    FROM `wechat`.`contact_room`\n'
+            f'    FROM `{self.db_names['wechat']}`.`{self.db_names['wechat.contact_room']}`\n'
             '    WHERE `room_id` = :room_id\n'
             '    LIMIT 1\n'
             ') AS `a`\n'
@@ -1262,6 +1262,6 @@ class WeChatDatabase(BaseWeChat):
 
         # Insert.
         self.database_wechat.execute_insert(
-            (self.path_names['wechat'], self.path_names['wechat.message_send']),
+            (self.db_names['wechat'], self.db_names['wechat.message_send']),
             data
         )

reywechat/rwechat.py

@@ -110,6 +110,7 @@ class WeChat(BaseWeChat):
 
         ## Database.
         self.send = self.sender.send = self.database.send
+        self.database_build = self.database.build
 
         ## Schedule.
         self.schedule_add_task = self.schedule.add_task

{reywechat-1.0.37.dist-info → reywechat-1.0.39.dist-info}/METADATA

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

{reywechat-1.0.37.dist-info → reywechat-1.0.39.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=Ok89qctzmhKB4JJOUq3xEPgjDIrjuu1qxMaYVyBploU,41484
+reywechat/rdb.py,sha256=1l7BGx-WC_DdDDAJrI-EsHUbdLApaQWGrxqAyggYXIA,42187
 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=Iir9EC0E3TmLElPf6k_Tkc7lZOr4uO1X9bpOZ0t0EV0,4884
+reywechat/rwechat.py,sha256=xkHQUUXDEqq4Q_DHF6vc3Dd33A8oOCkKyJN7v7p2leM,4935
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.37.dist-info/METADATA,sha256=vk2_0bUQNcTO9PUVImlVosBjsgM2xpgLJQM84k1UMAA,1551
-reywechat-1.0.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.37.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.37.dist-info/RECORD,,
+reywechat-1.0.39.dist-info/METADATA,sha256=YpRoJrcy0zs50O7BQKnVt9ukABoVK2APC2akitEv5AA,1551
+reywechat-1.0.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.39.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.39.dist-info/RECORD,,