Source HTTP: support archives with outer folder

pylon/core/providers/source/http_tar.py

@@ -18,6 +18,7 @@
 """ SourceProvider """
 
 import io
+import os
 import tarfile
 import tempfile
 
@@ -38,6 +39,7 @@ def __init__(self, context, settings):
         self.verify = self.settings.get("verify", True)
         #
         self.tar_mode = self.settings.get("tar_mode", "r")
+        self.use_inner_dir = self.settings.get("use_inner_dir", True)
 
     def init(self):
         """ Initialize provider """
@@ -67,6 +69,9 @@ def get_source(self, target):
         with tarfile.open(mode=self.tar_mode, fileobj=io.BytesIO(response.content)) as tar_file:
             tar_file.extractall(target_path)
         #
+        if self.use_inner_dir:
+            return os.path.join(target_path, os.listdir(target_path)[0])
+        #
         return target_path
 
     def get_multiple_source(self, targets):

pylon/core/providers/source/http_zip.py

@@ -18,6 +18,7 @@
 """ SourceProvider """
 
 import io
+import os
 import zipfile
 import tempfile
 
@@ -36,6 +37,8 @@ def __init__(self, context, settings):
         self.username = self.settings.get("username", None)
         self.password = self.settings.get("password", None)
         self.verify = self.settings.get("verify", True)
+        #
+        self.use_inner_dir = self.settings.get("use_inner_dir", True)
 
     def init(self):
         """ Initialize provider """
@@ -65,6 +68,9 @@ def get_source(self, target):
         with zipfile.ZipFile(io.BytesIO(response.content)) as zip_file:
             zip_file.extractall(target_path)
         #
+        if self.use_inner_dir:
+            return os.path.join(target_path, os.listdir(target_path)[0])
+        #
         return target_path
 
     def get_multiple_source(self, targets):