fork/cellxgene-gateway
1
0
Fork 0
mirror of https://github.com/Novartis/cellxgene-gateway.git synced 2026-10-09 03:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure s3 bucket does not include trailing slash

Browse Source
This commit is contained in:
Alok Saldanha
2021-04-02 11:37:11 -04:00
parent 76c1d9e80c
commit b1ae9e8ce8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/items/s3/s3item_source.py
+3 -1
View File
@@ -29,6 +29,8 @@ class S3ItemSource(ItemSource):
): ):
self._name = name self._name = name
self.s3 = s3fs.S3FileSystem() self.s3 = s3fs.S3FileSystem()
if bucket.startswith('s3://'):
raise Exception(f"Bucket name should not include s3:// prefix, got {bucket}")
self.bucket = bucket self.bucket = bucket
self.h5ad_suffix = h5ad_suffix self.h5ad_suffix = h5ad_suffix
self.annotation_dir_suffix = annotation_dir_suffix self.annotation_dir_suffix = annotation_dir_suffix
@@ -67,7 +69,7 @@ class S3ItemSource(ItemSource):
raise Exception(f"S3 url '{url}' does not exist.") raise Exception(f"S3 url '{url}' does not exist.")
s3key_map = dict( s3key_map = dict(
(filepath[len(self.bucket) :], "s3://" + filepath) (filepath[len(self.bucket) :].lstrip('/'), "s3://" + filepath)
for filepath in sorted(self.s3.ls(url)) for filepath in sorted(self.s3.ls(url))
) )