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

removed trailing slash from render_annotations

Browse Source
This commit is contained in:
Alok Saldanha
2021-03-28 21:59:03 -04:00
parent 6f2b372d32
commit 5404a8b0f3
7 changed files with 30 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/filecrawl.py
+9 -12
View File
@@ -8,14 +8,12 @@
# the specific language governing permissions and limitations under the License.
import os
from cellxgene_gateway import env
from cellxgene_gateway.dir_util import (
make_h5ad,
make_annotations,
annotations_suffix,
)
from flask import url_for
from cellxgene_gateway import env
from cellxgene_gateway.dir_util import annotations_suffix, make_annotations, make_h5ad
def recurse_dir(path):
if not os.path.exists(path):
@@ -45,19 +43,18 @@ def recurse_dir(path):
"name": x[:-13]
if (len(x) > 13 and x[-13] in ["-", "_"])
else (x[:-4] if x.endswith(".csv") else x),
"path": os.path.join(full_path, x).replace(
"path": os.path.join(full_path, x + "/").replace(
env.cellxgene_data, ""
),
}
for x in sorted(os.listdir(full_path))
if x.endswith(".csv")
and os.path.isfile(os.path.join(full_path, x))
if x.endswith(".csv") and os.path.isfile(os.path.join(full_path, x))
]
return [
{
"name": "new",
"class": "new",
"path": full_path.replace(env.cellxgene_data, ""),
"path": full_path.replace(env.cellxgene_data, "").rstrip("/"),
}
] + entries
@@ -92,7 +89,7 @@ def render_entries(entries):
def get_url(entry):
return url_for("do_view", path=entry["path"].lstrip("/") + "/")
return url_for("do_view", path=entry["path"].lstrip("/"))
def get_class(entry):
@@ -113,7 +110,7 @@ def render_annotations(entry):
def render_entry(entry):
if entry["type"] == "file":
return f"<li> <a href='{ get_url(entry) }'>{entry['name']}</a> {render_annotations(entry)}</li>"
return f"<li> <a href='{ get_url(entry) }/'>{entry['name']}</a> {render_annotations(entry)}</li>"
elif entry["type"] == "directory":
url = f"/filecrawl/{entry['path'].lstrip('/')}"
return f"<li><a href='{url}'>{entry['name']}</a>{render_entries(entry['children'])}</li>"