Use elfinder-client for static assets (#89)

* Use elfinder client

* Add blank line

* change order

* bump version

* Fix linter

* Sort list

imjoy_elfinder/VERSION

@@ -1,3 +1,3 @@
 {
-    "version": "0.1.46"
+    "version": "0.1.47"
 }

imjoy_elfinder/__init__.py

@@ -6,13 +6,19 @@
 by Alexandr Rakov 08-03-2012
 """
 from pyramid.config import Configurator
+from elfinder_client import get_base_dir
 
 IMJOY_ELFINDER_CONNECTOR = "imjoy_elfinder_connector"
 IMJOY_ELFINDER_FILEBROWSER = "imjoy_elfinder_filebrowser"
 
 
 def includeme(config: Configurator) -> None:
-    """Include frontend."""
-    config.include(".routes")
-    config.include(".assets")
+    """Include routes and assets."""
+    # routes
+    config.add_route(IMJOY_ELFINDER_FILEBROWSER, "/")
+    config.add_route(IMJOY_ELFINDER_CONNECTOR, "/connector/")
     config.scan(".views")
+    # assets
+    config.include("pyramid_jinja2")
+    config.add_jinja2_search_path("imjoy_elfinder:templates")
+    config.add_static_view(name="static", path=get_base_dir())

imjoy_elfinder/__main__.py

@@ -13,19 +13,13 @@
 from pyramid.response import Response
 from pyramid.router import Router
 
-from imjoy_elfinder import IMJOY_ELFINDER_FILEBROWSER
-
 
 def build_app(opt: argparse.Namespace, settings: Dict[str, Optional[str]]) -> Router:
     """Build the app."""
     config = Configurator(settings=settings)
     config.include("imjoy_elfinder")
-
-    # serve the folder content as static files under /static
-    config.add_static_view(settings["files_url"], settings["root_dir"])
-
-    # serve the file browser under /
-    config.add_route(IMJOY_ELFINDER_FILEBROWSER, "/")
+    # serve the folder content with a route path defined with `files_url`
+    config.add_static_view(name=settings["files_url"], path=settings["root_dir"])
 
     def add_cors_headers_response_callback(event: Any) -> None:
         def cors_headers(request: Request, response: Response) -> None:

imjoy_elfinder/elfinder.py

@@ -2106,7 +2106,7 @@ def _check_utf8(self, name: Union[str, bytes]) -> str:
 
 def _check_name(name: str) -> bool:
     """Check for valid file/dir name."""
-    if secure_filename(name) != name.replace(' ', '_'):  # type: ignore
+    if secure_filename(name) != name.replace(" ", "_"):  # type: ignore
         return False
     return True