Moved tar.gz decompression from single importers to the factory

process-intelligence-solutions · Jan 8, 2019 · f5ca153 · f5ca153
1 parent 046cdf4
commit f5ca153
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/pm4py/objects/log/importer/xes/factory.py b/pm4py/objects/log/importer/xes/factory.py
@@ -1,5 +1,6 @@
 from pm4py.objects.log.importer.xes.versions import iterparse_xes, python_nonstandard
 from pm4py.objects.log.util import string_to_file
+from pm4py.objects.log.util import compression
 
 ITERPARSE = "iterparse"
 NONSTANDARD = "nonstandard"
@@ -61,6 +62,9 @@ def import_log(path, parameters=None, variant=ITERPARSE):
     log
         Trace log object
     """
+    if path.endswith("gz"):
+        path = compression.decompress(path)
+
     return VERSIONS[variant](path, parameters=parameters)
 
 

diff --git a/pm4py/objects/log/importer/xes/versions/iterparse_xes.py b/pm4py/objects/log/importer/xes/versions/iterparse_xes.py
@@ -55,9 +55,6 @@ def import_log(filename, parameters=None):
     if "max_no_traces_to_import" in parameters:
         max_no_traces_to_import = parameters["max_no_traces_to_import"]
 
-    if filename.endswith("gz"):
-        filename = compression.decompress(filename)
-
     context = etree.iterparse(filename, events=['start', 'end'])
 
     log = None

diff --git a/pm4py/objects/log/importer/xes/versions/python_nonstandard.py b/pm4py/objects/log/importer/xes/versions/python_nonstandard.py
@@ -1,7 +1,6 @@
 import ciso8601
 
 from pm4py.objects import log as log_lib
-from pm4py.objects.log.util import compression
 from pm4py.objects.log.util import sorting
 
 
@@ -48,9 +47,6 @@ def import_log(filename, parameters=None):
     if "max_no_traces_to_import" in parameters:
         max_no_traces_to_import = parameters["max_no_traces_to_import"]
 
-    if filename.endswith("gz"):
-        filename = compression.decompress(filename)
-
     log = log_lib.log.TraceLog()
     tracecount = 0
     trace = None