From 823ed663e7d29bc7e8d1e4186f37f78bc52fa11b Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Sat, 13 Jul 2024 12:12:32 +0800 Subject: [PATCH] The check happened in __main__ already --- Whatsapp_Chat_Exporter/__main__.py | 2 +- Whatsapp_Chat_Exporter/contacts_names_from_vcards.py | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py index 236801a..228a644 100644 --- a/Whatsapp_Chat_Exporter/__main__.py +++ b/Whatsapp_Chat_Exporter/__main__.py @@ -546,8 +546,8 @@ def main(): if (args.filter_empty): data = {k: v for k, v in data.items() if not is_chat_empty(v)} - if contacts_names_from_vcards_enricher.should_enrich_names_from_vCards(): contacts_names_from_vcards_enricher.enrich_names_from_vCards(data) + if contact_store.should_enrich_from_vcards(): if isinstance(data[next(iter(data))], ChatStore): data = {jik: chat.to_json() for jik, chat in data.items()} diff --git a/Whatsapp_Chat_Exporter/contacts_names_from_vcards.py b/Whatsapp_Chat_Exporter/contacts_names_from_vcards.py index b1146b0..9784ebf 100644 --- a/Whatsapp_Chat_Exporter/contacts_names_from_vcards.py +++ b/Whatsapp_Chat_Exporter/contacts_names_from_vcards.py @@ -1,23 +1,15 @@ import itertools from typing import List, TypedDict - -try: - import vobject -except ModuleNotFoundError: - vcards_deps_installed = False -else: - vcards_deps_installed = True +import vobject class ContactsNamesFromVCards: def __init__(self) -> None: self.l = [] - def should_enrich_names_from_vCards(self): + def should_enrich_from_vcards(self): return len(self.l) > 0 def load_vcf_file(self, vcfFilePath: str, default_country_calling_code: str): - if not vcards_deps_installed: - raise Exception('Invariant: vobject is missing') self.l = readVCardsFile(vcfFilePath, default_country_calling_code) def enrich_names_from_vCards(self, chats):