Use url_for to generate URLs

cellxgene_gateway/filecrawl.py

@@ -14,6 +14,7 @@ from cellxgene_gateway.dir_util import (
     make_annotations,
     annotations_suffix,
 )
+from flask import url_for
 
 
 def recurse_dir(path):
@@ -44,13 +45,10 @@ 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, ""),
-                        env.cellxgene_data, ""
-                    ),
                 }
                 for x in sorted(os.listdir(full_path))
-                if x.endswith(".csv")
+                if x.endswith(".csv") and os.path.isfile(os.path.join(full_path, x))
-                and os.path.isfile(os.path.join(full_path, x))
             ]
         return [
             {
@@ -91,7 +89,7 @@ def render_entries(entries):
 
 
 def get_url(entry):
-    return f"/view/{ entry['path'].lstrip('/') }/"
+    return url_for("do_view", entry)
 
 
 def get_class(entry):

cellxgene_gateway/templates/index.html

@@ -35,12 +35,12 @@
 		Links:	
 	</h1>
 	<div class="list-group" style="width:50%;padding-left:65px">
-	  <a href="/filecrawl.html" class="list-group-item list-group-item-action">
+	  <a href="{{ url_for('filecrawl') }}" class="list-group-item list-group-item-action">
 		  <u>File Crawler: Allows you to view all uploaded data.</u></a>
 		  
 	</div>
 	<div class="list-group" style="width:50%;padding-left:65px">
-		<a href="/cache_status" class="list-group-item list-group-item-action">
+		<a href="{{ url_for('do_GET_status') }}" class="list-group-item list-group-item-action">
 			<u>Cache Status: view status of launched cellxgene servers.</u></a>
 	</div>