diff --git a/app/DataBase/exporter_html.py b/app/DataBase/exporter_html.py index 9e468b2..5b85959 100644 --- a/app/DataBase/exporter_html.py +++ b/app/DataBase/exporter_html.py @@ -241,7 +241,7 @@ class HtmlExporter(ExporterBase): 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 = '' + 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')}', timestamp:{timestamp},is_chatroom:{is_chatroom},displayname:'{display_name}',title:'{card_data.get('title')}', diff --git a/app/ui/contact/export_dialog.py b/app/ui/contact/export_dialog.py index 21004ff..81bd3c6 100644 --- a/app/ui/contact/export_dialog.py +++ b/app/ui/contact/export_dialog.py @@ -106,7 +106,7 @@ class ExportDialog(QDialog): def set_total_msg_num(self, num): self.total_msg_num = num - b''+num +(1,1) + # b''+num +(1,1) def export_finished(self): self.export_button.setEnabled(True) diff --git a/app/util/compress_content.py b/app/util/compress_content.py index 8ff8b2f..b9b2bbb 100644 --- a/app/util/compress_content.py +++ b/app/util/compress_content.py @@ -140,6 +140,7 @@ def share_card(bytesExtra, compress_content_): url = appmsg.find('url').text appinfo = root.find('appinfo') show_display_name = appmsg.find('sourcedisplayname') + sourceusername = appmsg.find('sourceusername') if show_display_name is not None: show_display_name = show_display_name.text else: @@ -155,6 +156,11 @@ def share_card(bytesExtra, compress_content_): if msginfo[1][1][1] == 4: app_logo = msginfo[1][2][1] app_logo = "\\".join(app_logo.split('\\')[1:]) + if sourceusername is not None: + from app.DataBase import micro_msg_db # 放上面会导致循环依赖 + contact = micro_msg_db.get_contact_by_username(sourceusername.text) + if contact: + app_logo = contact[7] return { 'title': escape_js_and_html(title), 'description': escape_js_and_html(des),