Merge pull request #265 from aaayun/feature-add-expired-or-lost-file-info

文件导出的一些优化

app/DataBase/exporter_html.py

@@ -12,13 +12,24 @@ from app.DataBase.package_msg import PackageMsg
 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
+from app.util.compress_content import parser_reply, share_card, music_share, file
 from app.util.emoji import get_emoji_url
-from app.util.file import get_file
 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'],
+}
+
+
+
 class HtmlExporter(ExporterBase):
     def text(self, doc, message):
         type_ = message[2]
@@ -95,21 +106,33 @@ class HtmlExporter(ExporterBase):
     def file(self, doc, message):
         origin_docx_path = f"{os.path.abspath('.')}/data/聊天记录/{self.contact.remark}"
         bytesExtra = message[10]
+        compress_content = message[11]
         str_time = message[8]
         is_send = message[4]
         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)
-        link = get_file(bytesExtra, thumb=True, output_path=origin_docx_path + '/file')
-        file_name = ''
-        file_path = './icon/file.png'
-        if link != "":
-            file_name = os.path.basename(link)
-            link = './file/' + file_name
-        doc.write(
-            f'''{{ type:49, text: '{file_path}',is_send:{is_send},avatar_path:'{avatar}',timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}',link: '{link}',sub_type:6,file_name: '{file_name}'}},'''
-        )
+        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:
+                    icon_path = icon
+                    break
+            # 如果没有与文件后缀匹配的图标，则使用默认图标
+            if icon_path is None:
+                default_icon = './icon/file.png'
+                icon_path = default_icon
+            file_path = file_info.get('file_path')
+            if file_path != "":
+                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}
+                            ,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')}'}},'''
+            )
 
     def refermsg(self, doc, message):
         """
@@ -200,16 +223,16 @@ class HtmlExporter(ExporterBase):
         timestamp = message[5]
         content = music_share(message[11])
         music_path = ''
-        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)
         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')}',
                 timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}',sub_type:3,title:'{content.get('title')}',

app/DataBase/output.py

@@ -5,6 +5,7 @@ import shutil
 import sys
 import time
 import traceback
+import filecmp
 from re import findall
 
 import docx
@@ -51,21 +52,24 @@ def makedirs(path):
     os.makedirs(os.path.join(path, 'avatar'), exist_ok=True)
     os.makedirs(os.path.join(path, 'music'), exist_ok=True)
     os.makedirs(os.path.join(path, 'icon'), exist_ok=True)
-    file = './app/resources/data/file.png'
-    if not os.path.exists(file):
-        resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__)))
-        file = os.path.join(resource_dir, 'app', 'resources', 'data', 'file.png')
-    shutil.copy(file, path + '/icon/file.png')
-    play_file = './app/resources/data/play.png'
-    if not os.path.exists(play_file):
-        resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__)))
-        play_file = os.path.join(resource_dir, 'app', 'resources', 'data', 'play.png')
-    shutil.copy(play_file, path + '/icon/play.png')
-    pause_file = './app/resources/data/pause.png'
-    if not os.path.exists(pause_file):
-        resource_dir = getattr(sys, '_MEIPASS', os.path.abspath(os.path.dirname(__file__)))
-        pause_file = os.path.join(resource_dir, 'app', 'resources', 'data', 'pause.png')
-    shutil.copy(pause_file, path + '/icon/pause.png')
+    resource_dir = os.path.join('app', 'resources', 'data', 'icons')
+    target_folder = os.path.join(path, 'icon')
+    # 拷贝一些必备的图标
+    for root, dirs, files in os.walk(resource_dir):
+        relative_path = os.path.relpath(root, resource_dir)
+        target_path = os.path.join(target_folder, relative_path)
+
+        # 遍历文件夹中的文件
+        for file in files:
+            source_file_path = os.path.join(root, file)
+            target_file_path = os.path.join(target_path, file)
+            if not os.path.exists(target_file_path):
+                shutil.copy(source_file_path, target_file_path)
+            else:
+                # 比较文件内容
+                if not filecmp.cmp(source_file_path, target_file_path, shallow=False):
+                    # 文件内容不一致，进行覆盖拷贝
+                    shutil.copy(source_file_path, target_file_path)
 
 
 def escape_js_and_html(input_str):