diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c4ef6dc..4d06ea9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,42 +4,13 @@ - @@ -703,7 +673,8 @@ - diff --git a/app/DataBase/hard_link.py b/app/DataBase/hard_link.py index 34236ec..1d0d367 100644 --- a/app/DataBase/hard_link.py +++ b/app/DataBase/hard_link.py @@ -54,6 +54,7 @@ def get_md5_from_xml(content): def get_image(content, thumb=False): md5 = get_md5_from_xml(content) # md5 = 'bc37a58c32cb203ee9ac587b068e5853' + md5 = '41895664fc5a77878e2155fc96209a19' result = get_image_by_md5(binascii.unhexlify(md5)) if result: # print(result) diff --git a/app/components/bubble_message.py b/app/components/bubble_message.py index f0bbe55..3f8c18f 100644 --- a/app/components/bubble_message.py +++ b/app/components/bubble_message.py @@ -20,7 +20,7 @@ class TextMessage(QLabel): self.setFont(font) self.setWordWrap(True) self.setMaximumWidth(800) - self.setMinimumWidth(100) + # self.setMinimumWidth(100) self.setMinimumHeight(45) self.setTextInteractionFlags(Qt.TextSelectableByMouse) self.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored) @@ -43,7 +43,8 @@ class TextMessage(QLabel): ) font_metrics = QFontMetrics(font) rect = font_metrics.boundingRect(text) - self.setMaximumWidth(rect.width() + 30) + # rect = font_metrics + self.setMaximumWidth(rect.width() + 40) def paintEvent(self, a0: QtGui.QPaintEvent) -> None: super(TextMessage, self).paintEvent(a0) diff --git a/app/decrypt/dat2pic.py b/app/decrypt/dat2pic.py index 9465b36..53e4ea0 100644 --- a/app/decrypt/dat2pic.py +++ b/app/decrypt/dat2pic.py @@ -17,8 +17,8 @@ def get_code(file_path): """ if os.path.isdir(file_path): return -1, -1 - if file_path[-4:] != ".dat": - return -1, -1 + # if file_path[-4:] != ".dat": + # return -1, -1 dat_file = open(file_path, "rb") dat_read = dat_file.read(2) # print(dat_read) @@ -29,9 +29,9 @@ def get_code(file_path): code = dat_read[0] ^ pic_head[head_index] idf_code = dat_read[1] ^ code head_index = head_index + 1 - if idf_code == pic_head[head_index]: - dat_file.close() - return head_index, code + # if idf_code == pic_head[head_index]: + # dat_file.close() + return head_index, code head_index = head_index + 1 dat_file.close() print("not jpg, png, gif") @@ -82,7 +82,7 @@ def find_datfile(dir_path, out_path): if __name__ == "__main__": - path = r"D:\download\wechat\WeChat Files\wxid_0o18ef858vnu22\FileStorage\MsgAttach\febd8caf62dd403a7212aef63fd55910\Thumb\2023-11" + path = "E:\86390\Documents\WeChat Files\wxid_27hqbq7vx5hf22\FileStorage\CustomEmotion\\71\\" outpath = "D:\\test" if not os.path.exists(outpath): os.mkdir(outpath) diff --git a/app/ui_pc/chat/chat_window.py b/app/ui_pc/chat/chat_window.py index 6ace6f6..ad5bbfc 100644 --- a/app/ui_pc/chat/chat_window.py +++ b/app/ui_pc/chat/chat_window.py @@ -70,12 +70,12 @@ class ChatWindow(QWidget, Ui_Form): self.stackedWidget.setCurrentIndex(0) def show_chats(self): - print('chat0') if self.ok_flag: return micro_msg.init_database() if not micro_msg.is_database_exist(): QMessageBox.critical(self, "错误", "数据库不存在\n请先解密数据库") + self.load_finish_signal.emit(True) return self.show_thread = ShowContactThread() self.show_thread.showSingal.connect(self.show_chat) diff --git a/app/ui_pc/contact/contact_window.py b/app/ui_pc/contact/contact_window.py index fee9a60..3b3ea27 100644 --- a/app/ui_pc/contact/contact_window.py +++ b/app/ui_pc/contact/contact_window.py @@ -75,6 +75,7 @@ class ContactWindow(QWidget, Ui_Form): micro_msg.init_database() if not micro_msg.is_database_exist(): QMessageBox.critical(self, "错误", "数据库不存在\n请先解密数据库") + self.load_finish_signal.emit(True) return self.show_thread = ShowContactThread() self.show_thread.showSingal.connect(self.show_contact) diff --git a/doc/images/html_message.png b/doc/images/html_message.png new file mode 100644 index 0000000..2764bfb Binary files /dev/null and b/doc/images/html_message.png differ