完成解析转账和音视频通话类型信息的两个后端接口

app/DataBase/exporter_csv.py

@@ -22,7 +22,7 @@ class CSVExporter(ExporterBase):
             # 写入数据
             # writer.writerows(messages)
             for msg in messages:
-                other_data = [msg[12].remark, msg[12].nickName, msg[12].wxid] if self.contact.is_chatroom else []
+                other_data = [msg[13].remark, msg[13].nickName, msg[13].wxid] if self.contact.is_chatroom else []
                 writer.writerow([*msg[:9], *other_data])
         print(f"【完成导出 CSV {self.contact.remark}】")
         self.okSignal.emit(1)

app/DataBase/exporter_docx.py

@@ -320,8 +320,8 @@ class DocxExporter(ExporterBase):
                 if message[4]:  # is_send
                     continue
                 try:
-                    chatroom_avatar_path = f"{origin_docx_path}/avatar/{message[12].wxid}.png"
-                    message[12].save_avatar(chatroom_avatar_path)
+                    chatroom_avatar_path = f"{origin_docx_path}/avatar/{message[13].wxid}.png"
+                    message[13].save_avatar(chatroom_avatar_path)
                 except:
                     print(message)
                     pass

app/DataBase/exporter_html.py

@@ -11,19 +11,26 @@ from app.DataBase.output import ExporterBase, escape_js_and_html
 from app.log import logger
 from app.person import Me
 from app.util import path
-from app.util.compress_content import parser_reply, share_card, music_share, file
+from app.util.compress_content import (
+    parser_reply,
+    share_card,
+    music_share,
+    file,
+    transfer_decompress,
+    call_decompress,
+)
 from app.util.emoji import get_emoji_url
 from app.util.image import get_image_path, get_image
 from app.util.music import get_music_path
 
 icon_files = {
-    './icon/word.png': ['doc', 'docx'],
-    './icon/excel.png': ['xls', 'xlsx'],
-    './icon/csv.png': ['csv'],
-    './icon/txt.png': ['txt'],
-    './icon/zip.png': ['zip', '7z', 'rar'],
-    './icon/ppt.png': ['ppt', 'pptx'],
-    './icon/pdf.png': ['pdf'],
+    "./icon/word.png": ["doc", "docx"],
+    "./icon/excel.png": ["xls", "xlsx"],
+    "./icon/csv.png": ["csv"],
+    "./icon/txt.png": ["txt"],
+    "./icon/zip.png": ["zip", "7z", "rar"],
+    "./icon/ppt.png": ["ppt", "pptx"],
+    "./icon/pdf.png": ["pdf"],
 }
 
 
@@ -40,7 +47,7 @@ class HtmlExporter(ExporterBase):
         avatar = self.get_avatar_path(is_send, message)
         str_content = escape_js_and_html(str_content)
         doc.write(
-            f'''{{ type:{1}, text: '{str_content}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+            f"""{{ type:{1}, text: '{str_content}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
         )
 
     def image(self, doc, message):
@@ -57,13 +64,17 @@ class HtmlExporter(ExporterBase):
         str_content = escape_js_and_html(str_content)
         image_path = hard_link_db.get_image(str_content, BytesExtra, thumb=False)
         if not os.path.exists(os.path.join(Me().wx_dir, image_path)):
-            image_thumb_path = hard_link_db.get_image(str_content, BytesExtra, thumb=True)
+            image_thumb_path = hard_link_db.get_image(
+                str_content, BytesExtra, thumb=True
+            )
             if not os.path.exists(os.path.join(Me().wx_dir, image_thumb_path)):
                 return
             image_path = image_thumb_path
-        image_path = get_image_path(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
+        image_path = get_image_path(
+            image_path, base_path=f"/data/聊天记录/{self.contact.remark}/image"
+        )
         doc.write(
-            f'''{{ type:{type_}, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+            f"""{{ type:{type_}, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
         )
 
     def audio(self, doc, message):
@@ -77,7 +88,9 @@ class HtmlExporter(ExporterBase):
         avatar = self.get_avatar_path(is_send, message)
         display_name = self.get_display_name(is_send, message)
         try:
-            audio_path = media_msg_db.get_audio_path(msgSvrId, output_path=origin_docx_path + "/voice")
+            audio_path = media_msg_db.get_audio_path(
+                msgSvrId, output_path=origin_docx_path + "/voice"
+            )
             audio_path = "./voice/" + os.path.basename(audio_path)
         except:
             logger.error(traceback.format_exc())
@@ -86,7 +99,7 @@ class HtmlExporter(ExporterBase):
         if voice_to_text and voice_to_text != "":
             voice_to_text = escape_js_and_html(voice_to_text)
         doc.write(
-            f'''{{ type:34, text:'{audio_path}',is_send:{is_send},avatar_path:'{avatar}',voice_to_text:'{voice_to_text}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+            f"""{{ type:34, text:'{audio_path}',is_send:{is_send},avatar_path:'{avatar}',voice_to_text:'{voice_to_text}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
         )
 
     def emoji(self, doc, message):
@@ -99,7 +112,7 @@ class HtmlExporter(ExporterBase):
         display_name = self.get_display_name(is_send, message)
         emoji_path = get_emoji_url(str_content, thumb=True)
         doc.write(
-            f'''{{ type:{3}, text: '{emoji_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+            f"""{{ type:{3}, text: '{emoji_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
         )
 
     def file(self, doc, message):
@@ -112,25 +125,27 @@ class HtmlExporter(ExporterBase):
         is_chatroom = 1 if self.contact.is_chatroom else 0
         avatar = self.get_avatar_path(is_send, message)
         display_name = self.get_display_name(is_send, message)
-        file_info = file(bytesExtra, compress_content, output_path=origin_docx_path + '/file')
-        if file_info.get('is_error') == False:
+        file_info = file(
+            bytesExtra, compress_content, output_path=origin_docx_path + "/file"
+        )
+        if file_info.get("is_error") == False:
             icon_path = None
             for icon, extensions in icon_files.items():
-                if file_info.get('file_ext') in extensions:
+                if file_info.get("file_ext") in extensions:
                     icon_path = icon
                     break
             # 如果没有与文件后缀匹配的图标，则使用默认图标
             if icon_path is None:
-                default_icon = './icon/file.png'
+                default_icon = "./icon/file.png"
                 icon_path = default_icon
-            file_path = file_info.get('file_path')
+            file_path = file_info.get("file_path")
             if file_path != "":
-                file_path = './file/' + file_info.get('file_name')
+                file_path = "./file/" + file_info.get("file_name")
             doc.write(
-                f'''{{ type:49, text: '{file_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp}
+                f"""{{ type:49, text: '{file_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp}
                             ,is_chatroom:{is_chatroom},displayname:'{display_name}',icon_path: '{icon_path}'
                             ,sub_type:6,file_name: '{file_info.get('file_name')}',file_size: '{file_info.get('file_len')}'
-                            ,app_name: '{file_info.get('app_name')}'}},'''
+                            ,app_name: '{file_info.get('app_name')}'}},"""
             )
 
     def refermsg(self, doc, message):
@@ -143,20 +158,20 @@ class HtmlExporter(ExporterBase):
         str_time = message[8]
         is_send = message[4]
         content = parser_reply(message[11])
-        refer_msg = content.get('refer')
+        refer_msg = content.get("refer")
         timestamp = message[5]
         is_chatroom = 1 if self.contact.is_chatroom else 0
         avatar = self.get_avatar_path(is_send, message)
         display_name = self.get_display_name(is_send, message)
-        contentText = escape_js_and_html(content.get('title'))
+        contentText = escape_js_and_html(content.get("title"))
         if refer_msg:
             referText = f"{escape_js_and_html(refer_msg.get('displayname'))}：{escape_js_and_html(refer_msg.get('content'))}"
             doc.write(
-                f'''{{ type:49, text: '{contentText}',is_send:{is_send},sub_type:{content.get('type')},refer_text: '{referText}',avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+                f"""{{ type:49, text: '{contentText}',is_send:{is_send},sub_type:{content.get('type')},refer_text: '{referText}',avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
             )
         else:
             doc.write(
-                f'''{{ type:49, text: '{contentText}',is_send:{is_send},sub_type:{content.get('type')},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+                f"""{{ type:49, text: '{contentText}',is_send:{is_send},sub_type:{content.get('type')},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
             )
 
     def system_msg(self, doc, message):
@@ -166,14 +181,15 @@ class HtmlExporter(ExporterBase):
         timestamp = message[5]
         is_chatroom = 1 if self.contact.is_chatroom else 0
 
-        str_content = str_content.replace('<![CDATA[', "").replace(
-            ' <a href="weixin://revoke_edit_click">重新编辑</a>]]>', "")
-        res = findall('(</{0,1}(img|revo|_wc_cus|a).*?>)', str_content)
+        str_content = str_content.replace("<![CDATA[", "").replace(
+            ' <a href="weixin://revoke_edit_click">重新编辑</a>]]>', ""
+        )
+        res = findall("(</{0,1}(img|revo|_wc_cus|a).*?>)", str_content)
         for xmlstr, b in res:
             str_content = str_content.replace(xmlstr, "")
         str_content = escape_js_and_html(str_content)
         doc.write(
-            f'''{{ type:0, text: '{str_content}',is_send:{is_send},avatar_path:'',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:''}},'''
+            f"""{{ type:0, text: '{str_content}',is_send:{is_send},avatar_path:'',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:''}},"""
         )
 
     def video(self, doc, message):
@@ -190,30 +206,32 @@ class HtmlExporter(ExporterBase):
         video_path = hard_link_db.get_video(str_content, BytesExtra, thumb=False)
         image_path = hard_link_db.get_video(str_content, BytesExtra, thumb=True)
         if video_path is None and image_path is not None:
-            image_path = path.get_relative_path(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
+            image_path = path.get_relative_path(
+                image_path, base_path=f"/data/聊天记录/{self.contact.remark}/image"
+            )
             try:
                 # todo 网络图片问题
                 print(origin_docx_path + image_path[1:])
                 os.utime(origin_docx_path + image_path[1:], (timestamp, timestamp))
                 doc.write(
-                    f'''{{ type:3, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+                    f"""{{ type:3, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
                 )
             except:
                 doc.write(
-                    f'''{{ type:1, text: '视频丢失',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+                    f"""{{ type:1, text: '视频丢失',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
                 )
             return
         if video_path is None and image_path is None:
             return
-        video_path = f'{Me().wx_dir}/{video_path}'
+        video_path = f"{Me().wx_dir}/{video_path}"
         if os.path.exists(video_path):
-            new_path = origin_docx_path + '/video/' + os.path.basename(video_path)
+            new_path = origin_docx_path + "/video/" + os.path.basename(video_path)
             if not os.path.exists(new_path):
-                shutil.copy(video_path, os.path.join(origin_docx_path, 'video'))
+                shutil.copy(video_path, os.path.join(origin_docx_path, "video"))
             os.utime(new_path, (timestamp, timestamp))
-            video_path = f'./video/{os.path.basename(video_path)}'
+            video_path = f"./video/{os.path.basename(video_path)}"
         doc.write(
-            f'''{{ type:{type_}, text: '{video_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},'''
+            f"""{{ type:{type_}, text: '{video_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}'}},"""
         )
 
     def music_share(self, doc, message):
@@ -221,21 +239,24 @@ class HtmlExporter(ExporterBase):
         is_send = message[4]
         timestamp = message[5]
         content = music_share(message[11])
-        music_path = ''
-        if content.get('is_error') == False:
-            if content.get('audio_url') != '':
-                music_path = get_music_path(content.get('audio_url'), content.get('title'),
-                                            output_path=origin_docx_path + '/music')
-                if music_path != '':
-                    music_path = f'./music/{os.path.basename(music_path)}'
-                    music_path = music_path.replace('\\', '/')
+        music_path = ""
+        if content.get("is_error") == False:
+            if content.get("audio_url") != "":
+                music_path = get_music_path(
+                    content.get("audio_url"),
+                    content.get("title"),
+                    output_path=origin_docx_path + "/music",
+                )
+                if music_path != "":
+                    music_path = f"./music/{os.path.basename(music_path)}"
+                    music_path = music_path.replace("\\", "/")
             is_chatroom = 1 if self.contact.is_chatroom else 0
             avatar = self.get_avatar_path(is_send, message)
             display_name = self.get_display_name(is_send, message)
             doc.write(
-                f'''{{ type:49, text:'{music_path}',is_send:{is_send},avatar_path:'{avatar}',link_url:'{content.get('link_url')}',
+                f"""{{ type:49, text:'{music_path}',is_send:{is_send},avatar_path:'{avatar}',link_url:'{content.get('link_url')}',
                 timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}',sub_type:3,title:'{content.get('title')}',
-                artist:'{content.get('artist')}', website_name:'{content.get('website_name')}'}},'''
+                artist:'{content.get('artist')}', website_name:'{content.get('website_name')}'}},"""
             )
 
     def share_card(self, doc, message):
@@ -248,53 +269,116 @@ class HtmlExporter(ExporterBase):
         is_chatroom = 1 if self.contact.is_chatroom else 0
         avatar = self.get_avatar_path(is_send, message)
         display_name = self.get_display_name(is_send, message)
-        thumbnail = ''
-        if card_data.get('thumbnail'):
-            thumbnail = os.path.join(Me().wx_dir, card_data.get('thumbnail'))
+        thumbnail = ""
+        if card_data.get("thumbnail"):
+            thumbnail = os.path.join(Me().wx_dir, card_data.get("thumbnail"))
             if os.path.exists(thumbnail):
-                shutil.copy(thumbnail, os.path.join(origin_docx_path, 'image', os.path.basename(thumbnail)))
-                thumbnail = './image/' + os.path.basename(thumbnail)
+                shutil.copy(
+                    thumbnail,
+                    os.path.join(
+                        origin_docx_path, "image", os.path.basename(thumbnail)
+                    ),
+                )
+                thumbnail = "./image/" + os.path.basename(thumbnail)
             else:
-                thumbnail = ''
-        app_logo = ''
-        if card_data.get('app_logo'):
-            app_logo = os.path.join(Me().wx_dir, card_data.get('app_logo'))
+                thumbnail = ""
+        app_logo = ""
+        if card_data.get("app_logo"):
+            app_logo = os.path.join(Me().wx_dir, card_data.get("app_logo"))
             if os.path.exists(app_logo):
-                shutil.copy(app_logo, os.path.join(origin_docx_path, 'image', os.path.basename(app_logo)))
-                app_logo = './image/' + os.path.basename(app_logo)
+                shutil.copy(
+                    app_logo,
+                    os.path.join(origin_docx_path, "image", os.path.basename(app_logo)),
+                )
+                app_logo = "./image/" + os.path.basename(app_logo)
             else:
-                app_logo = card_data.get('app_logo')
+                app_logo = card_data.get("app_logo")
         doc.write(
-            f'''{{ type:49,sub_type:5, text:'',is_send:{is_send},avatar_path:'{avatar}',url:'{card_data.get('url')}',
+            f"""{{ type:49,sub_type:5, text:'',is_send:{is_send},avatar_path:'{avatar}',url:'{card_data.get('url')}',
                     timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}',title:'{card_data.get('title')}',
                     description:'{card_data.get('description')}',thumbnail:'{thumbnail}',app_logo:'{app_logo}',
                     app_name:'{card_data.get('app_name')}'
-                    }},\n'''
+            }},\n"""
+        )
+
+    def transfer(self, doc, message):
+        is_send = message[4]
+        timestamp = message[5]
+        compress_content_ = message[11]
+        open("test.bin", "wb").write(compress_content_)
+        transfer_detail = transfer_decompress(compress_content_)
+        is_chatroom = 1 if self.contact.is_chatroom else 0
+        avatar = self.get_avatar_path(is_send, message)
+        display_name = self.get_display_name(is_send, message)
+        text_info_map = {
+            1: transfer_detail["pay_memo"] or "转账",
+            3: "已收款",
+            4: "已退还",
+        }
+        doc.write(
+            f"""{{ type:49, sub_type:2000, 
+                    text:'{text_info_map[transfer_detail["paysubtype"]]}',
+                    is_send:{is_send},avatar_path:'{avatar}',
+                    timestamp:{timestamp},is_chatroom:{is_chatroom},
+                    displayname:'{display_name}',paysubtype:{transfer_detail["paysubtype"]},
+                    pay_memo:'{transfer_detail["pay_memo"]}',feedesc:'{transfer_detail["feedesc"]}',
+            }},\n"""
+        )
+
+    def call(self, doc, message):
+        is_send = message[4]
+        timestamp = message[5]
+        str_content = message[7]
+        bytes_extra = message[10]
+        display_content = message[12]
+        call_detail = call_decompress(
+            is_send, bytes_extra, display_content, str_content
+        )
+        is_chatroom = 1 if self.contact.is_chatroom else 0
+        avatar = self.get_avatar_path(is_send, message)
+        display_name = self.get_display_name(is_send, message)
+        doc.write(
+            f"""{{ type:50, text:'{call_detail["display_content"]}',
+                    call_type:{call_detail["call_type"]},avatar_path:'{avatar}',
+                    timestamp:{timestamp},is_chatroom:{is_chatroom},
+                    displayname:'{display_name}',
+            }},\n"""
         )
 
     def export(self):
         print(f"【开始导出 HTML {self.contact.remark}】")
         messages = msg_db.get_messages(self.contact.wxid, time_range=self.time_range)
         filename = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}/{self.contact.remark}.html"
-        file_path = './app/resources/data/template.html'
+        file_path = "./app/resources/data/template.html"
         if not os.path.exists(file_path):
-            resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__)))
-            file_path = os.path.join(resource_dir, 'app', 'resources', 'data', 'template.html')
+            resource_dir = getattr(
+                sys, "_MEIPASS", os.path.abspath(os.path.dirname(__file__))
+            )
+            file_path = os.path.join(
+                resource_dir, "app", "resources", "data", "template.html"
+            )
 
         with open(file_path, "r", encoding="utf-8") as f:
             content = f.read()
-            html_head, html_end = content.split('/*注意看这是分割线*/')
-        f = open(filename, 'w', encoding='utf-8')
-        html_head = html_head.replace("<title>出错了</title>", f"<title>{self.contact.remark}</title>")
-        html_head = html_head.replace("<p id=\"title\">出错了</p>", f"<p id=\"title\">{self.contact.remark}</p>")
+            html_head, html_end = content.split("/*注意看这是分割线*/")
+        f = open(filename, "w", encoding="utf-8")
+        html_head = html_head.replace(
+            "<title>出错了</title>", f"<title>{self.contact.remark}</title>"
+        )
+        html_head = html_head.replace(
+            '<p id="title">出错了</p>', f'<p id="title">{self.contact.remark}</p>'
+        )
         f.write(html_head)
         self.rangeSignal.emit(len(messages))
         for index, message in enumerate(messages):
             type_ = message[2]
             sub_type = message[3]
             timestamp = message[5]
-            if (type_ == 3 and self.message_types.get(3)) or (type_ == 34 and self.message_types.get(34)) or (
-                    type_ == 47 and self.message_types.get(47)):
+            if (
+                (type_ == 3 and self.message_types.get(3))
+                or (type_ == 34 and self.message_types.get(34))
+                or (type_ == 47 and self.message_types.get(47))
+            ):
                 pass
             else:
                 self.progressSignal.emit(1)
@@ -319,6 +403,10 @@ class HtmlExporter(ExporterBase):
                 self.music_share(f, message)
             elif type_ == 49 and sub_type == 5 and self.message_types.get(4905):
                 self.share_card(f, message)
+            elif type_ == 49 and sub_type == 2000 and self.message_types.get(492000):
+                self.transfer(f, message)
+            elif type_ == 50 and self.message_types.get(50):
+                self.call(f, message)
             if index % 2000 == 0:
                 print(f"【导出 HTML {self.contact.remark}】{index}/{len(messages)}")
         f.write(html_end)
@@ -333,7 +421,7 @@ class HtmlExporter(ExporterBase):
         @return:
         """
         self.num += 1
-        print('子线程完成', self.num, '/', self.total_num)
+        print("子线程完成", self.num, "/", self.total_num)
         if self.num == self.total_num:
             # 所有子线程都完成之后就发送完成信号
             self.okSignal.emit(1)
@@ -343,6 +431,7 @@ class OutputMedia(QThread):
     """
     导出语音消息
     """
+
     okSingal = pyqtSignal(int)
     progressSignal = pyqtSignal(int)
 
@@ -357,7 +446,9 @@ class OutputMedia(QThread):
             is_send = message[4]
             msgSvrId = message[9]
             try:
-                audio_path = media_msg_db.get_audio(msgSvrId, output_path=origin_docx_path + "/voice")
+                audio_path = media_msg_db.get_audio(
+                    msgSvrId, output_path=origin_docx_path + "/voice"
+                )
             except:
                 logger.error(traceback.format_exc())
             finally:
@@ -369,6 +460,7 @@ class OutputEmoji(QThread):
     """
     导出表情包
     """
+
     okSingal = pyqtSignal(int)
     progressSignal = pyqtSignal(int)
 
@@ -395,6 +487,7 @@ class OutputImage(QThread):
     """
     导出图片
     """
+
     okSingal = pyqtSignal(int)
     progressSignal = pyqtSignal(int)
 
@@ -407,10 +500,10 @@ class OutputImage(QThread):
 
     def count1(self, num):
         self.num += 1
-        print('图片导出完成一个')
+        print("图片导出完成一个")
         if self.num == self.child_thread_num:
             self.okSingal.emit(47)
-            print('图片导出完成')
+            print("图片导出完成")
 
     def run(self):
         origin_docx_path = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}"
@@ -420,13 +513,19 @@ class OutputImage(QThread):
             BytesExtra = message[10]
             timestamp = message[5]
             try:
-                image_path = hard_link_db.get_image(str_content, BytesExtra, thumb=False)
+                image_path = hard_link_db.get_image(
+                    str_content, BytesExtra, thumb=False
+                )
                 if not os.path.exists(os.path.join(Me().wx_dir, image_path)):
-                    image_thumb_path = hard_link_db.get_image(str_content, BytesExtra, thumb=True)
+                    image_thumb_path = hard_link_db.get_image(
+                        str_content, BytesExtra, thumb=True
+                    )
                     if not os.path.exists(os.path.join(Me().wx_dir, image_thumb_path)):
                         continue
                     image_path = image_thumb_path
-                image_path = get_image(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
+                image_path = get_image(
+                    image_path, base_path=f"/data/聊天记录/{self.contact.remark}/image"
+                )
                 try:
                     os.utime(origin_docx_path + image_path[1:], (timestamp, timestamp))
                 except:
@@ -464,13 +563,19 @@ class OutputImageChild(QThread):
             BytesExtra = message[10]
             timestamp = message[5]
             try:
-                image_path = hard_link_db.get_image(str_content, BytesExtra, thumb=False)
+                image_path = hard_link_db.get_image(
+                    str_content, BytesExtra, thumb=False
+                )
                 if not os.path.exists(os.path.join(Me().wx_dir, image_path)):
-                    image_thumb_path = hard_link_db.get_image(str_content, BytesExtra, thumb=True)
+                    image_thumb_path = hard_link_db.get_image(
+                        str_content, BytesExtra, thumb=True
+                    )
                     if not os.path.exists(os.path.join(Me().wx_dir, image_thumb_path)):
                         continue
                     image_path = image_thumb_path
-                image_path = get_image(image_path, base_path=f'/data/聊天记录/{self.contact.remark}/image')
+                image_path = get_image(
+                    image_path, base_path=f"/data/聊天记录/{self.contact.remark}/image"
+                )
                 try:
                     os.utime(origin_docx_path + image_path[1:], (timestamp, timestamp))
                 except:
@@ -480,4 +585,4 @@ class OutputImageChild(QThread):
             finally:
                 self.progressSignal.emit(1)
         self.okSingal.emit(47)
-        print('图片子线程完成')
+        print("图片子线程完成")

app/DataBase/msg.py

@@ -35,7 +35,8 @@ def parser_chatroom_message(messages):
         a[9]: msgSvrId,
         a[10]: BytesExtra,
         a[11]: CompressContent,
-        a[12]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
+        a[12]: DisplayContent,
+        a[13]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
     '''
     updated_messages = []  # 用于存储修改后的消息列表
     for row in messages:
@@ -157,13 +158,15 @@ class Msg:
             a[9]: msgSvrId,
             a[10]: BytesExtra,
             a[11]: CompressContent,
+            a[12]: DisplayContent,
+            a[13]: 联系人的类（如果是群聊就有，不是的话没有这个字段）
         """
         if not self.open_flag:
             return None
         if time_range:
             start_time, end_time = time_range
         sql = f'''
-            select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent
+            select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent,DisplayContent
             from MSG
             where StrTalker=?
             {'AND CreateTime>' + str(start_time) + ' AND CreateTime<' + str(end_time) if time_range else ''}

app/DataBase/output.py

@@ -118,12 +118,12 @@ class ExporterBase(QThread):
     def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str:
         if is_absolute_path:
             if self.contact.is_chatroom:
-                avatar = message[12].avatar_path
+                avatar = message[13].avatar_path
             else:
                 avatar = Me().avatar_path if is_send else self.contact.avatar_path
         else:
             if self.contact.is_chatroom:
-                avatar = message[12].smallHeadImgUrl
+                avatar = message[13].smallHeadImgUrl
             else:
                 avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl
         return avatar
@@ -133,7 +133,7 @@ class ExporterBase(QThread):
             if is_send:
                 display_name = Me().name
             else:
-                display_name = message[12].remark
+                display_name = message[13].remark
         else:
             display_name = Me().name if is_send else self.contact.remark
         return escape_js_and_html(display_name)

app/DataBase/package_msg.py

@@ -107,7 +107,8 @@ class PackageMsg:
             a[9]: msgSvrId,
             a[10]: BytesExtra,
             a[11]: CompressContent,
-            a[12]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
+            a[12]: DisplayContent,
+            a[13]: msg_sender, （ContactPC 或 ContactDefault 类型，这个才是群聊里的信息发送人，不是群聊或者自己是发送者没有这个字段）
         '''
         updated_messages = []  # 用于存储修改后的消息列表
         messages = msg_db.get_messages(chatroom_wxid)