fix: preserve enabled key in merged plugin config; revert trailing slash on url_prefix
This commit is contained in:
@@ -83,7 +83,7 @@ def load_plugins(app: "Quart") -> None:
|
|||||||
# Merge plugin.yaml config defaults with user overrides (non-"enabled" keys)
|
# Merge plugin.yaml config defaults with user overrides (non-"enabled" keys)
|
||||||
defaults = meta.get("config", {})
|
defaults = meta.get("config", {})
|
||||||
user_overrides = {k: v for k, v in cfg.items() if k != "enabled"}
|
user_overrides = {k: v for k, v in cfg.items() if k != "enabled"}
|
||||||
plugins_cfg[name] = {**defaults, **user_overrides}
|
plugins_cfg[name] = {"enabled": True, **defaults, **user_overrides}
|
||||||
|
|
||||||
# Import the plugin package
|
# Import the plugin package
|
||||||
try:
|
try:
|
||||||
@@ -113,7 +113,7 @@ def load_plugins(app: "Quart") -> None:
|
|||||||
if hasattr(module, "get_blueprint"):
|
if hasattr(module, "get_blueprint"):
|
||||||
try:
|
try:
|
||||||
bp = module.get_blueprint()
|
bp = module.get_blueprint()
|
||||||
app.register_blueprint(bp, url_prefix=f"/plugins/{name}/")
|
app.register_blueprint(bp, url_prefix=f"/plugins/{name}")
|
||||||
logger.info("Plugin %r: blueprint registered at /plugins/%s/", name, name)
|
logger.info("Plugin %r: blueprint registered at /plugins/%s/", name, name)
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.exception("Plugin %r: get_blueprint() raised", name)
|
logger.exception("Plugin %r: get_blueprint() raised", name)
|
||||||
|
|||||||
Reference in New Issue
Block a user