From 26901d33206d7f20bb789728d96acc2791a16f73 Mon Sep 17 00:00:00 2001 From: Daniel Caldeweyher Date: Thu, 17 Nov 2016 13:31:23 +1000 Subject: [PATCH 1/2] added --existing-index option --- csv2es.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/csv2es.py b/csv2es.py index 642e3ba..0b5d102 100644 --- a/csv2es.py +++ b/csv2es.py @@ -162,11 +162,13 @@ def sanitize_delimiter(delimiter, is_tab): help='Parallel uploads to send at once, defaults to 1') @click.option('--delete-index', is_flag=True, required=False, help='Delete existing index if it exists') +@click.option('--existing-index', is_flag=True, required=False, + help='Don\'t create index.') @click.option('--quiet', is_flag=True, required=False, help='Minimize console output') @click.version_option(version=__version__, ) def cli(index_name, delete_index, mapping_file, doc_type, import_file, - delimiter, tab, host, docs_per_chunk, bytes_per_chunk, parallel, quiet): + delimiter, tab, host, docs_per_chunk, bytes_per_chunk, parallel, existing_index, quiet): """ Bulk import a delimited file into a target Elasticsearch instance. Common delimited files include things like CSV and TSV. @@ -193,11 +195,12 @@ def cli(index_name, delete_index, mapping_file, doc_type, import_file, except ElasticHttpNotFoundError: echo('Index ' + index_name + ' not found, nothing to delete', quiet) - try: - es.create_index(index_name) - echo('Created new index: ' + index_name, quiet) - except IndexAlreadyExistsError: - echo('Index ' + index_name + ' already exists', quiet) + if not existing_index: + try: + es.create_index(index_name) + echo('Created new index: ' + index_name, quiet) + except IndexAlreadyExistsError: + echo('Index ' + index_name + ' already exists', quiet) echo('Using document type: ' + doc_type, quiet) if mapping_file: From 2c9ce981971e38e4c55033bc63df5c4d62ef44c9 Mon Sep 17 00:00:00 2001 From: Daniel Caldeweyher Date: Thu, 17 Nov 2016 13:37:04 +1000 Subject: [PATCH 2/2] ignore intellij idea module file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3010f49..aaeaa84 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dist *.pyc *.egg-info +*.iml