calvin.erfmann/WhatsApp-Chat-Exporter
1
0
Fork 0
mirror of https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git synced 2026-04-24 15:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed remaining compatibility issues with latest code

Browse Source
This commit is contained in:
fschuh
2025-05-04 15:58:02 -04:00
parent f460f76441
commit 2f15360526
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Whatsapp_Chat_Exporter/__main__.py
View File

@@ -701,8 +701,6 @@ def main():
args.whatsapp_theme, args.whatsapp_theme,
args.headline args.headline
) )
elif args.incremental_merge:
incremental_merge(args.source_dir, args.target_dir, args.media)
elif args.exported: elif args.exported:
# Process exported chat # Process exported chat
process_exported_chat(args, data) process_exported_chat(args, data)
@@ -749,16 +747,19 @@ def main():
if args.wa is None: if args.wa is None:
args.wa = "ContactsV2.sqlite" args.wa = "ContactsV2.sqlite"
# Process contacts if args.incremental_merge:
process_contacts(args, data, contact_store) incremental_merge(args.source_dir, args.target_dir, args.media)
else:
# Process messages, media, and calls # Process contacts
process_messages(args, data) process_contacts(args, data, contact_store)
# Create output files # Process messages, media, and calls
create_output_files(args, data, contact_store) process_messages(args, data)
# Handle media directory # Create output files
handle_media_directory(args) create_output_files(args, data, contact_store)
# Handle media directory
handle_media_directory(args)
print("Everything is done!") print("Everything is done!")

12
Whatsapp_Chat_Exporter/data_model.py
View File

@@ -255,7 +255,7 @@ class ChatStore:
self.status = other.status or self.status self.status = other.status or self.status
# Merge messages # Merge messages
self.messages.update(other.messages) self._messages.update(other._messages)
class Message: class Message:
""" """
@@ -341,10 +341,12 @@ class Message:
@classmethod @classmethod
def from_json(cls, data): def from_json(cls, data):
message = cls( message = cls(
data["from_me"], from_me = data["from_me"],
data["timestamp"], timestamp = data["timestamp"],
data["time"], time = data["time"],
data["key_id"] key_id = data["key_id"],
received_timestamp = data.get("received_timestamp"),
read_timestamp = data.get("read_timestamp")
) )
message.media = data.get("media") message.media = data.get("media")
message.meta = data.get("meta") message.meta = data.get("meta")