mirror of
https://github.com/Novartis/cellxgene-gateway.git
synced 2026-10-09 13:08:11 +08:00
removed .csv suffix from annotation name
This commit is contained in:
@@ -18,10 +18,11 @@ class FileItem(Item):
|
||||
The Item superclass expects a 'name' and 'type'.
|
||||
"""
|
||||
|
||||
def __init__(self, subpath: str, *args, **kwargs):
|
||||
def __init__(self, subpath: str, ext: str = "", *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.subpath = subpath
|
||||
self.ext = ext
|
||||
|
||||
@property
|
||||
def descriptor(self) -> str:
|
||||
return os.path.join(self.subpath, self.name).strip("/")
|
||||
return os.path.join(self.subpath, self.name + self.ext).strip("/")
|
||||
|
||||
@@ -150,9 +150,16 @@ class FileItemSource(ItemSource):
|
||||
def make_fileitem_from_path(
|
||||
self, filename, subpath, is_annotation=False, is_shallow=False
|
||||
) -> FileItem:
|
||||
if is_annotation and filename.endswith(self.annotation_file_suffix):
|
||||
name = filename[: -len(self.annotation_file_suffix)]
|
||||
ext = self.annotation_file_suffix
|
||||
else:
|
||||
name = filename
|
||||
ext = ""
|
||||
item = FileItem(
|
||||
subpath=subpath,
|
||||
name=filename,
|
||||
name=name,
|
||||
ext=ext,
|
||||
type=ItemType.annotation if is_annotation else ItemType.h5ad,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user