Dir path for communitydata

DesignSafe-CI · Oct 31, 2023 · d60acea · d60acea
1 parent c605e66
commit d60acea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/dsjobs/dir.py b/dsjobs/dir.py
@@ -19,17 +19,17 @@ def get_ds_path_uri(ag, path):
     # If any of the following directory patterns are found in the path,
     # process them accordingly.
     directory_patterns = [
-        ("jupyter/MyData", "designsafe.storage.default"),
-        ("jupyter/mydata", "designsafe.storage.default"),
-        ("jupyter/CommunityData", "designsafe.storage.community"),
-        ("/MyData", "designsafe.storage.default"),
-        ("/mydata", "designsafe.storage.default"),
+        ("jupyter/MyData", "designsafe.storage.default", True),
+        ("jupyter/mydata", "designsafe.storage.default", True),
+        ("jupyter/CommunityData", "designsafe.storage.community", False),
+        ("/MyData", "designsafe.storage.default", True),
+        ("/mydata", "designsafe.storage.default", True),
     ]
 
-    for pattern, storage in directory_patterns:
+    for pattern, storage, use_username in directory_patterns:
         if pattern in path:
             path = path.split(pattern).pop()
-            input_dir = ag.profiles.get()["username"] + path
+            input_dir = ag.profiles.get()["username"] + path if use_username else path
             input_uri = f"agave://{storage}/{input_dir}"
             return input_uri.replace(" ", "%20")
 

diff --git a/tests/test_dir_uri.py b/tests/test_dir_uri.py
@@ -28,7 +28,7 @@ def test_directory_patterns(self, mock_path_exists):
             ),
             (
                 "jupyter/CommunityData/communitypath",
-                "agave://designsafe.storage.community/testuser/communitypath",
+                "agave://designsafe.storage.community//communitypath",
             ),
         ]
         for path, expected in test_cases: