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

Don't prefix view IDs with plugin name

Browse source
This commit is contained in:
jtc42 2019-11-19 21:47:23 +00:00
parent 0cb678beed
commit eb321220c6
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/plugins/loader.py
View file

@ -201,7 +201,6 @@ class PluginLoader(object):
): # If plugin_object is an instance of MicroscopePlugin ): # If plugin_object is an instance of MicroscopePlugin
# Attach plugin_object to the plugin mount # Attach plugin_object to the plugin mount
setattr(self, plugin_name_python_safe, plugin_object) setattr(self, plugin_name_python_safe, plugin_object)
# Store the plugin object, and it's properties # Store the plugin object, and it's properties
self._plugins.append(plugin_object) self._plugins.append(plugin_object)
# DEPRECATED: Store the plugin with it's old name # DEPRECATED: Store the plugin with it's old name
@ -213,7 +212,7 @@ class PluginLoader(object):
logging.info( logging.info(
ConColors.OKGREEN ConColors.OKGREEN
+ "Plugin {} loaded as {}.".format(plugin_map, plugin_name) + "Plugin {} loaded as {}.".format(plugin_map, plugin_object._name)
+ ConColors.ENDC + ConColors.ENDC
) )
@ -257,7 +256,6 @@ class BasePlugin:
# Create a Python-safe route ID # Create a Python-safe route ID
view_id = cleaned_rule.replace("/", "_") view_id = cleaned_rule.replace("/", "_")
full_view_id = f"{self._name_python_safe}_{view_id}"
# Store route information in a dictionary # Store route information in a dictionary
d = { d = {
@ -266,9 +264,9 @@ class BasePlugin:
} }
# Add view to private views dictionary # Add view to private views dictionary
self._views[full_view_id] = d self._views[view_id] = d
# Store the rule expansion information # Store the rule expansion information
self._rules[rule] = self._views[full_view_id] self._rules[rule] = self._views[view_id]
@property @property
def form(self): def form(self):