fix: resolved nesting issue when uploading directory

Author: opensaucerer

lighthouse/axios.py

@@ -4,6 +4,7 @@
 from typing import Dict, List, Tuple
 import requests as req
 from . import types as t
+from . import utils
 
 
 class Axios:
@@ -38,45 +39,12 @@ def post(
         except Exception as e:
             raise e
 
-    def extract_file_name(self, file: str) -> str:
-        return file.split("/")[-1]
-
-    def extract_file_last_dir(self, file: str) -> str:
-        return file.split("/")[-2]
-
-    def read_files(self, files: t.FileDict) -> List[Tuple[BufferedReader]]:
-        file_list = []
-        for file in files["files"]:
-            if files["is_dir"]:
-                file_list.append(
-                    (
-                        "file",
-                        (
-                            file,
-                            open(file, "rb"),
-                            "application/octet-stream",
-                        ),
-                    )
-                )
-            else:
-                file_list.append(
-                    (
-                        "file",
-                        (
-                            self.extract_file_name(file),
-                            open(file, "rb"),
-                            "application/octet-stream",
-                        ),
-                    ),
-                )
-        return file_list
-
     def post_files(
         self, file: t.FileDict, headers: Dict[str, str] = None, **kwargs
     ) -> dict | Exception:
         try:
             self.parse_url_query(kwargs.get("query", None))
-            files = self.read_files(file)
+            files = utils.read_files_for_upload(file)
             r = req.post(self.url, headers=headers, files=files)
             r.raise_for_status()
             try:

lighthouse/deploy.py

@@ -23,10 +23,12 @@ def deploy(source: str, token: str) -> t.Deploy:
             # walk directory tree and add files to list
             file_dict["files"] = walk_dir_tree(source)
             file_dict["is_dir"] = True
+            file_dict["path"] = source
         else:
             # add file to list
             file_dict["files"] = [source]
             file_dict["is_dir"] = False
+            file_dict["path"] = source
 
         # create headers
         headers = {

lighthouse/types.py

@@ -16,3 +16,4 @@ class FileDict(TypedDict):
 
     files: List[str]
     is_dir: bool
+    path: str

lighthouse/utils.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 
+from io import BufferedReader
 import os
-from typing import List
+from typing import List, Tuple
+from . import types as t
 
 # walk path and return list of file paths
 def walk_dir_tree(path: str) -> List[str]:
@@ -15,3 +17,40 @@ def walk_dir_tree(path: str) -> List[str]:
 # check if file is a directory
 def is_dir(path: str) -> bool:
     return os.path.isdir(path)
+
+
+def extract_file_name(file: str) -> str:
+    return file.split("/")[-1]
+
+
+def extract_file_name_with_source(file: str, source: str) -> str:
+    base = source.split("/")[-1]
+    return base + file.split(base)[-1]
+
+
+def read_files_for_upload(files: t.FileDict) -> List[Tuple[BufferedReader]]:
+    file_list = []
+    for file in files["files"]:
+        if files["is_dir"]:
+            file_list.append(
+                (
+                    "file",
+                    (
+                        extract_file_name_with_source(file, files["path"]),
+                        open(file, "rb"),
+                        "application/octet-stream",
+                    ),
+                )
+            )
+        else:
+            file_list.append(
+                (
+                    "file",
+                    (
+                        extract_file_name(file),
+                        open(file, "rb"),
+                        "application/octet-stream",
+                    ),
+                ),
+            )
+    return file_list

requirements.txt

@@ -0,0 +1,11 @@
+black==22.8.0
+certifi==2022.9.14
+charset-normalizer==2.1.1
+click==8.1.3
+idna==3.4
+mypy-extensions==0.4.3
+pathspec==0.10.1
+platformdirs==2.5.2
+requests==2.28.1
+tomli==2.0.1
+urllib3==1.26.12

tests/setup.py

@@ -6,18 +6,22 @@
 
 def parse_env():
     """parse .env file"""
-    with open(".env", "r") as f:
-        for line in f.readlines():
-            if line.startswith("#"):
-                continue
-            key, value = line.split("=")
-            os.environ[key] = value.strip()
+    try:
+        with open(".env", "r") as f:
+            for line in f.readlines():
+                if line.startswith("#"):
+                    continue
+                key, value = line.split("=")
+                os.environ[key] = value.strip()
+    except FileNotFoundError:
+        print("No .env file found")
+        print("Defaulting to preset environment variables...")
 
 
 def run_test():
     """setup test environment and run tests"""
     parse_env()
-    dt.test_deploy_file()
+    # dt.test_deploy_file()
     dt.test_deploy_dir()