feature: implement tar.gz support

ckanext/__init__.py

@@ -3,7 +3,9 @@
 # this is a namespace package
 try:
     import pkg_resources
+
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     import pkgutil
+
     __path__ = pkgutil.extend_path(__path__, __name__)

ckanext/unfold/adapters/_7z.py

@@ -5,9 +5,8 @@
 import py7zr
 from py7zr import FileInfo, exceptions
 
-import ckanext.unfold.utils as unf_utils
 import ckanext.unfold.types as unf_types
-
+import ckanext.unfold.utils as unf_utils
 
 log = logging.getLogger(__name__)
 

ckanext/unfold/adapters/__init__.py

@@ -1,4 +1,6 @@
-from . import rar, _7z, zip, gzip, tar
+from functools import partial
+
+from . import _7z, gzip, rar, tar, zip
 
 ADAPTERS = {
     "rar": rar.build_directory_tree,
@@ -7,5 +9,6 @@
     "zip": zip.build_directory_tree,
     "gz": gzip.build_directory_tree,
     "gzip": gzip.build_directory_tree,
-    "tar": tar.build_directory_tree
+    "tar": partial(tar.build_directory_tree),
+    "tar.gz": partial(tar.build_directory_tree, gz=True),
 }

ckanext/unfold/adapters/gzip.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from ckan import model as model
+
 import ckanext.unfold.types as unf_types
 
 

ckanext/unfold/adapters/rar.py

@@ -3,10 +3,11 @@
 import logging
 
 import rarfile
-from rarfile import RarInfo, Error as RarError
+from rarfile import Error as RarError
+from rarfile import RarInfo
 
-import ckanext.unfold.utils as unf_utils
 import ckanext.unfold.types as unf_types
+import ckanext.unfold.utils as unf_utils
 
 log = logging.getLogger(__name__)
 

ckanext/unfold/adapters/tar.py

@@ -1,19 +1,18 @@
 from __future__ import annotations
 
 import logging
-
 import tarfile
-from tarfile import TarInfo, TarError
+from tarfile import TarError, TarInfo
 
-import ckanext.unfold.utils as unf_utils
 import ckanext.unfold.types as unf_types
+import ckanext.unfold.utils as unf_utils
 
 log = logging.getLogger(__name__)
 
 
-def build_directory_tree(filepath: str):
+def build_directory_tree(filepath: str, gz: bool = False):
     try:
-        with tarfile.TarFile(filepath) as archive:
+        with tarfile.open(filepath, "r:gz" if gz else "r") as archive:
             file_list: list[TarInfo] = archive.getmembers()
     except TarError as e:
         log.error(f"Error openning rar archive: {e}")

ckanext/unfold/adapters/zip.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import logging
-from zipfile import ZipFile, ZipInfo, LargeZipFile, BadZipFile
+from zipfile import BadZipFile, LargeZipFile, ZipFile, ZipInfo
 
-import ckanext.unfold.utils as unf_utils
 import ckanext.unfold.types as unf_types
+import ckanext.unfold.utils as unf_utils
 
 log = logging.getLogger(__name__)
 

ckanext/unfold/helpers.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
 
-import logging
 import json
-
-import requests
-from requests.exceptions import RequestException
-
+import logging
 from typing import Any
 
 import ckan.lib.uploader as uploader
+import requests
+from requests.exceptions import RequestException
 
 import ckanext.unfold.adapters as unf_adapters
 import ckanext.unfold.types as unf_types

ckanext/unfold/logic/schema.py

@@ -4,7 +4,6 @@
 
 from ckan.logic.schema import validator_args
 
-
 Schema = Dict[str, Any]
 
 

setup.py

@@ -7,10 +7,10 @@
     # message extraction at
     # http://babel.pocoo.org/docs/messages/#extraction-method-mapping-and-configuration
     message_extractors={
-        'ckanext': [
-            ('**.py', 'python', None),
-            ('**.js', 'javascript', None),
-            ('**/templates/**.html', 'ckan', None),
+        "ckanext": [
+            ("**.py", "python", None),
+            ("**.js", "javascript", None),
+            ("**/templates/**.html", "ckan", None),
         ],
     }
 )