github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Plugin static assets support both hyphens and underscores in names

Browse source 
Closes #611
This commit is contained in:
Simon Willison 2019-11-01 15:15:10 -07:00
commit ed57e4f990
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
datasette/app.py
View file

@ -612,8 +612,17 @@ class Datasette:
# Mount any plugin static/ directories # Mount any plugin static/ directories
for plugin in get_plugins(pm): for plugin in get_plugins(pm):
if plugin["static_path"]: if plugin["static_path"]:
modpath = "/-/static-plugins/{}/(?P<path>.*)$".format(plugin["name"]) add_route(
add_route(asgi_static(plugin["static_path"]), modpath) asgi_static(plugin["static_path"]),
"/-/static-plugins/{}/(?P<path>.*)$".format(plugin["name"]),
)
# Support underscores in name in addition to hyphens, see https://github.com/simonw/datasette/issues/611
add_route(
asgi_static(plugin["static_path"]),
"/-/static-plugins/{}/(?P<path>.*)$".format(
plugin["name"].replace("-", "_")
),
)
add_route( add_route(
JsonDataView.as_asgi(self, "metadata.json", lambda: self._metadata), JsonDataView.as_asgi(self, "metadata.json", lambda: self._metadata),
r"/-/metadata(?P<as_format>(\.json)?)$", r"/-/metadata(?P<as_format>(\.json)?)$",

2
docs/plugins.rst
View file

@ -442,7 +442,7 @@ you have one:
@hookimpl @hookimpl
def extra_js_urls(): def extra_js_urls():
return [ return [
'/-/static-plugins/your_plugin/app.js' '/-/static-plugins/your-plugin/app.js'
] ]
.. _plugin_hook_publish_subcommand: .. _plugin_hook_publish_subcommand: