diff --git a/.github/workflows/compile-binary.yml b/.github/workflows/compile-binary.yml index 48e459d..bad45ed 100644 --- a/.github/workflows/compile-binary.yml +++ b/.github/workflows/compile-binary.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install pycryptodome vobject javaobj-py3 ordered-set zstandard nuitka==2.6.7 + pip install pycryptodome javaobj-py3 ordered-set zstandard nuitka==2.6.7 pip install . - name: Build binary with Nuitka run: | @@ -45,7 +45,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install pycryptodome vobject javaobj-py3 ordered-set zstandard nuitka==2.6.7 + pip install pycryptodome javaobj-py3 ordered-set zstandard nuitka==2.6.7 pip install . - name: Build binary with Nuitka run: | @@ -69,7 +69,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install pycryptodome vobject javaobj-py3 ordered-set zstandard nuitka==2.6.7 + pip install pycryptodome javaobj-py3 ordered-set zstandard nuitka==2.6.7 pip install . - name: Build binary with Nuitka run: | diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py index e20fff4..89c7e97 100644 --- a/Whatsapp_Chat_Exporter/__main__.py +++ b/Whatsapp_Chat_Exporter/__main__.py @@ -20,16 +20,8 @@ from argparse import ArgumentParser, SUPPRESS from datetime import datetime from getpass import getpass from sys import exit -from typing import Tuple, Optional, List, Dict, Any, Union - -# Try to import vobject for contacts processing -try: - import vobject -except ModuleNotFoundError: - vcards_deps_installed = False -else: - from Whatsapp_Chat_Exporter.vcards_contacts import ContactsFromVCards - vcards_deps_installed = True +from typing import Optional, List, Dict +from Whatsapp_Chat_Exporter.vcards_contacts import ContactsFromVCards logger = logging.getLogger(__name__) @@ -432,13 +424,6 @@ def process_single_date_filter(parser: ArgumentParser, args) -> None: def setup_contact_store(args) -> Optional['ContactsFromVCards']: """Set up and return a contact store if needed.""" if args.enrich_from_vcards is not None: - if not vcards_deps_installed: - logger.error( - "You don't have the dependency to enrich contacts with vCard.\n" - "Read more on how to deal with enriching contacts:\n" - "https://github.com/KnugiHK/Whatsapp-Chat-Exporter/blob/main/README.md#usage\n" - ) - exit(1) contact_store = ContactsFromVCards() contact_store.load_vcf_file( args.enrich_from_vcards, args.default_country_code) diff --git a/pyproject.toml b/pyproject.toml index 054bbc3..6bc571f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,10 +44,9 @@ android_backup = ["pycryptodome", "javaobj-py3"] crypt12 = ["pycryptodome"] crypt14 = ["pycryptodome"] crypt15 = ["pycryptodome", "javaobj-py3"] -all = ["pycryptodome", "javaobj-py3", "vobject"] -everything = ["pycryptodome", "javaobj-py3", "vobject"] +all = ["pycryptodome", "javaobj-py3"] +everything = ["pycryptodome", "javaobj-py3"] backup = ["pycryptodome", "javaobj-py3"] -vcards = ["vobject", "pycryptodome", "javaobj-py3"] [project.scripts] wtsexporter = "Whatsapp_Chat_Exporter.__main__:main"