refactor: allow for trailing slashes in folder upload

Author: opensaucerer

lighthouse/deploy.py

@@ -21,9 +21,9 @@ def deploy(source: str, token: str) -> t.Deploy:
         # check if source is a directory
         if is_dir(source):
             # walk directory tree and add files to list
-            file_dict["files"] = walk_dir_tree(source)
+            file_dict["files"], root = walk_dir_tree(source)
             file_dict["is_dir"] = True
-            file_dict["path"] = source
+            file_dict["path"] = root
         else:
             # add file to list
             file_dict["files"] = [source]

lighthouse/utils.py

@@ -6,12 +6,14 @@
 from . import types as t
 
 # walk path and return list of file paths
-def walk_dir_tree(path: str) -> List[str]:
+def walk_dir_tree(path: str) -> Tuple[List[str], str]:
     file_list = []
+    roots = []
     for root, dirs, files in os.walk(path):
+        roots.append(root)
         for file in files:
             file_list.append(os.path.join(root, file))
-    return file_list
+    return file_list, roots[0]
 
 
 # check if file is a directory
@@ -24,6 +26,8 @@ def extract_file_name(file: str) -> str:
 
 
 def extract_file_name_with_source(file: str, source: str) -> str:
+    if source.endswith("/"):
+        source = source[: len(source) - 1]
     base = source.split("/")[-1]
     return base + file.split(base)[-1]
 

tests/test_deploy.py

@@ -21,7 +21,7 @@ def test_deploy_file(self):
     def test_deploy_dir(self):
         """test deploy function"""
         l = Lighthouse(os.environ["LH_TOKEN"])
-        res = l.deploy("tests/testdir")
+        res = l.deploy("tests/testdir/")
         self.assertNotEqual(res.get("data"), None, "data is None")
         self.assertIsInstance(res.get("data"), str, "data is a string")
         self.assertIn("Hash", res.get("data"), "Hash is in data")