Merge branch 'develop'

.gitignore

@@ -102,3 +102,7 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# evtx2es
+*.json
+*.evtx

README.md

@@ -59,6 +59,22 @@ $ evtx2es /evtxfiles/ # The Path is recursively expanded to file1~6.evtx.
 ### Options
 
 ```
+--version, -v
+
+--help, -h
+
+--quiet, -q
+  Flag to suppress standard output
+  (default: False)
+
+--multiprocess, -m:
+  Flag to run multiprocessing (fast!)
+  (default: False)
+
+--size:
+  Size of the chunk to be processed for each process
+  (default: 500)
+
 --host:
   ElasticSearch host address
   (default: localhost)
@@ -71,10 +87,6 @@ $ evtx2es /evtxfiles/ # The Path is recursively expanded to file1~6.evtx.
   Index name of Import destination
   (default: evtx2es)
 
---size:
-  Number of grouped documents during bulk insertion (Normally, It doesn't need to change this option.)
-  (default: 500)
-
 --scheme:
   Scheme to use (http, or https)
   (default: http)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "evtx2es"
-version = "1.4.6"
+version = "1.5.0"
 description = "Fast import of Windows EventLogs(.evtx) into Elasticsearch."
 authors = ["sumeshi <[email protected]>"]
 license = "MIT"
@@ -12,8 +12,8 @@ homepage = "https://github.com/sumeshi/evtx2es"
 keywords = ['evtx', 'elasticsearch', 'json']
 
 [tool.poetry.scripts]
-evtx2es = 'evtx2es:console_evtx2es'
-evtx2json = 'evtx2es:console_evtx2json'
+evtx2es = 'evtx2es.views.Evtx2esView:entry_point'
+evtx2json = 'evtx2es.views.Evtx2jsonView:entry_point'
 
 [tool.poetry.dependencies]
 python = "^3.7"
@@ -22,6 +22,7 @@ evtx = "^0.6.6"
 tqdm = "^4.46.1"
 urllib3 = "^1.26.5"
 orjson = "^3.4.6"
+importlib_metadata = "^4.6.1"
 
 [tool.poetry.dev-dependencies]
 mypy = "^0.780"