diff --git a/README.md b/README.md index 69d3476..9667684 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,10 @@ Options: -D, --duplicates-destination TEXT Directory to move duplicates files, relative to the directory containing the vCards. Default: duplicates + -i, --ignore-field TEXT Fields to ignore when considering duplicate + contacts. Default: ["prodid", "uid", "version", + "rev", "x-thunderbird-etag", "x-mozilla-html", "photo", + "categories"] --config FILE Read configuration from FILE. --help Show this message and exit.``` diff --git a/find_duplicate_contacts/find_duplicate_contacts.py b/find_duplicate_contacts/find_duplicate_contacts.py index 695faa3..9376bfb 100755 --- a/find_duplicate_contacts/find_duplicate_contacts.py +++ b/find_duplicate_contacts/find_duplicate_contacts.py @@ -37,16 +37,6 @@ class FindDuplicateContacts: ) self._init_log() - self.ignore_fields = [ - "prodid", - "uid", - "version", - "rev", - "x-thunderbird-etag", - "x-mozilla-html", - "photo" - ] - self.duplicates_folder = os.path.join( self.config['directory'], self.config['duplicates_destination'] @@ -80,7 +70,7 @@ class FindDuplicateContacts: vcard = vobject.readOne(content) for key in vcard.contents.keys(): - if key not in self.ignore_fields: + if key not in self.config['ignore_field']: card['content'][key] = list() for item in vcard.contents[key]: card['content'][key].append(item.value) @@ -242,6 +232,22 @@ class FindDuplicateContacts: default='duplicates', help='Directory to move duplicates files, relative to the directory containing the vCards.' ) +@click.option( + '--ignore-field', + '-i', + multiple=True, + default = [ + "prodid", + "uid", + "version", + "rev", + "x-thunderbird-etag", + "x-mozilla-html", + "photo", + "categories" + ], + help='Fields to ignore when considering duplicate contacts.', +) @click_config_file.configuration_option() def __main__(**kwargs): return FindDuplicateContacts(**kwargs) diff --git a/pyproject.toml b/pyproject.toml index 5b6942d..b101fda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ Homepage = "https://repos.susurrando.com/adelgado/find_duplicate_contacts" [project] name = "find_duplicate_contacts" -version = "1.0.0" +version = "1.0.1" description = "Find duplicate contacts in vCard files" readme = "README.md" authors = [{ name = "Antonio J. Delgado", email = "TXj6QGdwejbTD1iWAj2ws9pnV@susurrando.com" }] diff --git a/setup.cfg b/setup.cfg index 6a386a8..7744f77 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = find_duplicate_contacts -version = 1.0.0 +version = 1.0.1 [options] packages = find_duplicate_contacts diff --git a/setup.py b/setup.py index 3059530..77cb4b7 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ config.read('setup.cfg') setuptools.setup( scripts=['find_duplicate_contacts/find_duplicate_contacts.py'], author="Antonio J. Delgado", - version='1.0.0', + version='1.0.1', name='find_duplicate_contacts', author_email="TXj6QGdwejbTD1iWAj2ws9pnV@susurrando.com", url="https://susurrando.com",