reywechat 1.0.61__py3-none-any.whl → 1.0.63__py3-none-any.whl

reywechat/rdb.py

@@ -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.

reywechat/rreceive.py

@@ -809,22 +809,22 @@ class WeChatMessage(WeChatBase):
             throw(AssertionError, self._is_quote)
 
         # Extract.
-        pattern = '<title>(.+?)</title>'
+        pattern = '<title>([^<>]+)</title>'
         text: str = search(pattern, self.data)
-        pattern = r'<svrid>(\w+?)</svrid>'
+        pattern = r'<svrid>([^<>]+)</svrid>'
         quote_id = search(pattern, self.data)
         quote_id = int(quote_id)
-        pattern = r'<createtime>(\d{10})</createtime>'
+        pattern = r'<createtime>([^<>]+)</createtime>'
         quote_time = search(pattern, self.data)
         quote_time = int(quote_time)
-        pattern = r'<refermsg>\s*<type>(\d+?)</type>'
+        pattern = r'<refermsg>.*?<type>([^<>]+)</type>'
         quote_type = search(pattern, self.data)
         quote_type = int(quote_type)
-        pattern = r'<chatusr>(\w+?)</chatusr>'
+        pattern = r'<chatusr>([^<>]+)</chatusr>'
         quote_user: str = search(pattern, self.data)
-        pattern = '<displayname>(.+?)</displayname>'
+        pattern = '<displayname>([^<>]+)</displayname>'
         quote_user_name: str = search(pattern, self.data)
-        pattern = '<content>(.+?)</content>'
+        pattern = '<content>([^<>]+)</content>'
         quote_data: str = search(pattern, self.data)
         self._quote_params: MessageQuoteParameter = {
             'text': text,

{reywechat-1.0.61.dist-info → reywechat-1.0.63.dist-info}/METADATA

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

{reywechat-1.0.61.dist-info → reywechat-1.0.63.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/rdb.py,sha256=24QhuT30JdyD3rirHBZQ-hGiJE1BVBppqH-JKlqOPQw,48769
 reywechat/rlog.py,sha256=4EsTgrgC05JvWeKAucUaWGga638CRRJISJN6qncBCAw,5249
-reywechat/rreceive.py,sha256=WLuq4yQF_Hl6rcr8Lnn6Qo_w3NnTZjv1JgDNIf7mcG4,51191
+reywechat/rreceive.py,sha256=akRLA5j17ySLEUG5HnlYy4PSboQgHay9AcLapJrJM9k,51206
 reywechat/rsend.py,sha256=yrJf9GzWVCDptUHHazhWSVW0nm2LCIbb0sz2EII63bY,20049
 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.61.dist-info/METADATA,sha256=COevHB7V-A4FBDZiOV6iqAPz1MwJZIr1fN3UjjfZVAc,1551
-reywechat-1.0.61.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.61.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.61.dist-info/RECORD,,
+reywechat-1.0.63.dist-info/METADATA,sha256=oCuPrB0kJQDxPf2bi_U-DWrl7mqOmzTXPrQ6yf21NZ0,1551
+reywechat-1.0.63.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.63.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.63.dist-info/RECORD,,