Fix version display

imjoy-team · Feb 13, 2021 · 6f5e711 · 6f5e711
1 parent cb51be4
commit 6f5e711
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 31 deletions.
diff --git a/imjoy_elfinder/elfinder.py b/imjoy_elfinder/elfinder.py
@@ -839,8 +839,7 @@ def __upload_large_file(self) -> None:
                                 break
 
                     with open(
-                        record_path,
-                        "r+" if os.path.exists(record_path) else "w+",
+                        record_path, "r+" if os.path.exists(record_path) else "w+",
                     ) as fil:
                         fil.seek(chunk_index)
                         fil.write("X")
@@ -1937,9 +1936,7 @@ def _path2url(self, path: str) -> str:
         cur_dir = path
         length = len(self._options["root"])
         url = multi_urljoin(
-            self._options["base_url"],
-            self._options["files_url"],
-            cur_dir[length:],
+            self._options["base_url"], self._options["files_url"], cur_dir[length:],
         )
         url = self._check_utf8(url).replace(os.sep, "/")
         url = quote(url, safe="/")
@@ -2393,10 +2390,5 @@ def make_hash(to_hash: str) -> str:
 def multi_urljoin(*parts: str) -> str:
     """Join multiple url parts into a valid url."""
     if parts[0].startswith("http"):
-        return str(
-            urljoin(
-                parts[0],
-                "/".join(part.strip("/") for part in parts[1:]),
-            )
-        )
+        return str(urljoin(parts[0], "/".join(part.strip("/") for part in parts[1:]),))
     return "/" + "/".join(part.strip("/") for part in parts if part)
diff --git a/imjoy_elfinder/views.py b/imjoy_elfinder/views.py
@@ -16,7 +16,7 @@
 from fastapi.responses import FileResponse
 from fastapi.responses import PlainTextResponse, JSONResponse
 
-from . import elfinder
+from . import elfinder, __version__
 from .api_const import API_NAME, API_TARGETS, API_DIRS, API_UPLOAD, API_UPLOAD_PATH
 from .util import get_all, get_one
 from .settings import get_settings
@@ -108,5 +108,6 @@ async def connector(request: Request):
 @router.get("/filebrowser", response_class=HTMLResponse)
 async def index(request: Request):
     return templates.TemplateResponse(
-        "elfinder/filebrowser.jinja2", {"request": request}
+        "elfinder/filebrowser.jinja2",
+        {"request": request, "IMJOY_ELFINDER_VERSION": __version__},
     )
diff --git a/tests/test_elfinder.py b/tests/test_elfinder.py
@@ -238,24 +238,8 @@ def test_run(
             None,
             {"file": "txt_file_parent", "mode": 0o100},
         ),  # With no init and no read access to target
-        (
-            "Invalid parameters",
-            None,
-            [],
-            None,
-            None,
-            None,
-            None,
-        ),
-        (
-            "File not found",
-            None,
-            [],
-            None,
-            "missing",
-            None,
-            None,
-        ),
+        ("Invalid parameters", None, [], None, None, None, None,),
+        ("File not found", None, [], None, "missing", None, None,),
     ],
     indirect=["access"],
 )