From fd8ca847bef352662d5dbf61055f6b79e78860a9 Mon Sep 17 00:00:00 2001
From: amar jandu <ajandu@ucsc.edu>
Date: Tue, 5 May 2020 17:30:04 -0700
Subject: [PATCH] Create subdirectories

---
 hca/dss/__init__.py                           |  2 +-
 test/integration/dss/test_dss_api.py          | 38 ++++++++++++++++++-
 .../res/nested_bundle/zarr!exclamation.zattrs |  4 ++
 test/res/nested_bundle/zarr/nested.zattrs     |  4 ++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 test/res/nested_bundle/zarr!exclamation.zattrs
 create mode 100644 test/res/nested_bundle/zarr/nested.zattrs

diff --git a/hca/dss/__init__.py b/hca/dss/__init__.py
index 51891310..7c197eca 100644
--- a/hca/dss/__init__.py
+++ b/hca/dss/__init__.py
@@ -505,7 +505,7 @@ def download_bundle(self, bundle_uuid, version="", metadata_filter=('*',), data_
 
         for file_ in manifest['bundle']['files']:
             dss_file = DSSFile.from_dss_bundle_response(file_, self.replica)
-            filename = file_.get("name", dss_file.uuid)
+            filename = file_.get("name", dss_file.uuid).replace('!', '/')
             walking_dir = bundle_dir
 
             globs = metadata_filter if file_['indexed'] else data_filter
diff --git a/test/integration/dss/test_dss_api.py b/test/integration/dss/test_dss_api.py
index 12c87c9d..224015b3 100755
--- a/test/integration/dss/test_dss_api.py
+++ b/test/integration/dss/test_dss_api.py
@@ -21,6 +21,18 @@
 from test import reset_tweak_changes, TEST_DIR
 
 
+def get_uploaded_file_names(path: str):
+    files = []
+    for entry in os.scandir(path=path):
+        if entry.is_file():
+            files.append(entry.name)
+        if entry.is_dir():
+            nested_files = get_uploaded_file_names(entry.path)
+            for file in nested_files:
+                files.append('{}/{}'.format(entry.name, file))
+    return files
+
+
 class TestDssApi(unittest.TestCase):
     staging_bucket = "org-humancellatlas-dss-cli-test"
 
@@ -71,9 +83,31 @@ def test_python_nested_bundle_upload_download(self):
                 downloaded_file_paths = [object_name_builder(p, dest_dir) for p in downloaded_file_names]
                 self.assertEqual(uploaded_files.sort(), downloaded_file_paths.sort())
 
+    @unittest.skipIf(os.name is 'nt', 'Unable to test on Windows')  # TODO windows testing refactor
+    def test_python_exclamation_replacement(self):
+        bundle_path = os.path.join(TEST_DIR, "res", "nested_bundle")
+        uploaded_files = set(get_uploaded_file_names(bundle_path))
+
+        bundle_output = self.client.upload(src_dir=bundle_path,
+                                      replica="aws",
+                                      staging_bucket=self.staging_bucket)
+
+        bundle_uuid = bundle_output['bundle_uuid']
+        bundle_version = bundle_output['version']
+        bundle_fqid = "{}.{}".format(bundle_uuid, bundle_version)
+
+        manifest_files = bundle_output['files']
+        self.assertEqual({file['name'] for file in manifest_files}, uploaded_files)
+
+        with tempfile.TemporaryDirectory() as dest_dir:
+            self.client.download(bundle_uuid=bundle_output['bundle_uuid'], replica="aws", download_dir=dest_dir)
+            nested_downloaded_files = [file.name for file in os.scandir('{}/{}/zarr'.format(dest_dir, bundle_fqid))]
+            for file in ['exclamation.zattrs', 'nested.zattrs']:
+                self.assertIn(file, nested_downloaded_files)
+
     def test_python_upload_download(self):
         bundle_path = os.path.join(TEST_DIR, "res", "bundle")
-        uploaded_files = set(os.listdir(bundle_path))
+        uploaded_files = set(get_uploaded_file_names(bundle_path))
 
         manifest = self.client.upload(src_dir=bundle_path,
                                       replica="aws",
@@ -139,7 +173,7 @@ def test_python_upload_download(self):
 
     def test_python_manifest_download(self):
         bundle_path = os.path.join(TEST_DIR, "res", "bundle")
-        uploaded_files = set(os.listdir(bundle_path))
+        uploaded_files = set(get_uploaded_file_names(bundle_path))
 
         manifest = self.client.upload(src_dir=bundle_path,
                                       replica="aws",
diff --git a/test/res/nested_bundle/zarr!exclamation.zattrs b/test/res/nested_bundle/zarr!exclamation.zattrs
new file mode 100644
index 00000000..29d0996d
--- /dev/null
+++ b/test/res/nested_bundle/zarr!exclamation.zattrs
@@ -0,0 +1,4 @@
+{
+    "README": "The schema adopted in this zarr store may undergo changes in the future",
+    "sample_id": "0432e9a5-604f-4cb7-8571-014eb5fd8ba2"
+}
\ No newline at end of file
diff --git a/test/res/nested_bundle/zarr/nested.zattrs b/test/res/nested_bundle/zarr/nested.zattrs
new file mode 100644
index 00000000..29d0996d
--- /dev/null
+++ b/test/res/nested_bundle/zarr/nested.zattrs
@@ -0,0 +1,4 @@
+{
+    "README": "The schema adopted in this zarr store may undergo changes in the future",
+    "sample_id": "0432e9a5-604f-4cb7-8571-014eb5fd8ba2"
+}
\ No newline at end of file