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

Bug fix on vobject being a necessary dependency

Browse Source
This commit is contained in:
KnugiHK
2024-09-11 00:07:39 +08:00
parent 484910cf5c
commit 884ccc4cc0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Whatsapp_Chat_Exporter/__main__.py
View File

@@ -12,10 +12,10 @@ try:
except ModuleNotFoundError: except ModuleNotFoundError:
vcards_deps_installed = False vcards_deps_installed = False
else: else:
from Whatsapp_Chat_Exporter.vcards_contacts import ContactsFromVCards
vcards_deps_installed = True vcards_deps_installed = True
from Whatsapp_Chat_Exporter import exported_handler, android_handler from Whatsapp_Chat_Exporter import exported_handler, android_handler
from Whatsapp_Chat_Exporter import ios_handler, ios_media_handler from Whatsapp_Chat_Exporter import ios_handler, ios_media_handler
from Whatsapp_Chat_Exporter.vcards_contacts import ContactsFromVCards
from Whatsapp_Chat_Exporter.data_model import ChatStore from Whatsapp_Chat_Exporter.data_model import ChatStore
from Whatsapp_Chat_Exporter.utility import APPLE_TIME, Crypt, DbType, chat_is_empty from Whatsapp_Chat_Exporter.utility import APPLE_TIME, Crypt, DbType, chat_is_empty
from Whatsapp_Chat_Exporter.utility import check_update, import_from_json, sanitize_filename from Whatsapp_Chat_Exporter.utility import check_update, import_from_json, sanitize_filename
@@ -371,8 +371,6 @@ def main():
data = {} data = {}
contact_store = ContactsFromVCards()
if args.enrich_from_vcards is not None: if args.enrich_from_vcards is not None:
if not vcards_deps_installed: if not vcards_deps_installed:
parser.error( parser.error(
@@ -380,6 +378,7 @@ def main():
"Read more on how to deal with enriching contacts:\n" "Read more on how to deal with enriching contacts:\n"
"https://github.com/KnugiHK/Whatsapp-Chat-Exporter/blob/main/README.md#usage" "https://github.com/KnugiHK/Whatsapp-Chat-Exporter/blob/main/README.md#usage"
) )
contact_store = ContactsFromVCards()
contact_store.load_vcf_file(args.enrich_from_vcards, args.default_contry_code) contact_store.load_vcf_file(args.enrich_from_vcards, args.default_contry_code)
if args.android: if args.android:
@@ -491,7 +490,7 @@ def main():
if args.android: if args.android:
android_handler.calls(db, data, args.timezone_offset, filter_chat) android_handler.calls(db, data, args.timezone_offset, filter_chat)
if not args.no_html: if not args.no_html:
if not contact_store.is_empty(): if args.enrich_from_vcards is not None and not contact_store.is_empty():
contact_store.enrich_from_vcards(data) contact_store.enrich_from_vcards(data)
create_html( create_html(
@@ -564,7 +563,7 @@ def main():
if args.filter_empty: if args.filter_empty:
data = {k: v for k, v in data.items() if not chat_is_empty(v)} data = {k: v for k, v in data.items() if not chat_is_empty(v)}
if not contact_store.is_empty(): if args.enrich_from_vcards is not None and not contact_store.is_empty():
contact_store.enrich_from_vcards(data) contact_store.enrich_from_vcards(data)
if isinstance(data[next(iter(data))], ChatStore): if isinstance(data[next(iter(data))], ChatStore):

3
Whatsapp_Chat_Exporter/vcards_contacts.py
View File

@@ -1,6 +1,5 @@
import itertools
from typing import List, TypedDict
import vobject import vobject
from typing import List, TypedDict
class ExportedContactNumbers(TypedDict): class ExportedContactNumbers(TypedDict):