rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed plugin route attaching

Browse source
This commit is contained in:
Joel Collins 2019-12-13 14:49:28 +00:00
parent 477abb6970
commit 779c112ecc
3 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
openflexure_microscope/api/app.py
View file

@ -16,16 +16,11 @@ from flask_cors import CORS
from openflexure_microscope.api.exceptions import JSONExceptionHandler
from openflexure_microscope.api.utilities import list_routes
from openflexure_microscope.config import (
settings_file_path,
JSONEncoder,
USER_PLUGINS_PATH,
)
from openflexure_microscope.config import settings_file_path, JSONEncoder
from openflexure_microscope.api.v1 import blueprints
from openflexure_microscope.api import v2
from openflexure_microscope.common.labthings import LabThing
from openflexure_microscope.common.labthings.plugins import find_plugins
from openflexure_microscope.api.microscope import default_microscope as api_microscope
@ -140,21 +135,6 @@ v2_actions_blueprint = v2.blueprints.actions.construct_blueprint(api_microscope)
app.register_blueprint(v2_actions_blueprint, url_prefix=uri("/actions", "v2"))
plugins = find_plugins(USER_PLUGINS_PATH)
print(plugins.__plugins__)
for plugin_obj in plugins.__plugins__:
for plugin_view_id, plugin_view in plugin_obj.views.items():
# Add route to the plugins blueprint
app.add_url_rule(
"/new-plugins" + plugin_view["rule"],
view_func=plugin_view["view"].as_view(
f"{plugin_obj._name_python_safe}_{plugin_view_id}"
),
**plugin_view["kwargs"],
)
@app.route("/routes")
def routes():
"""