opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from abretaud/dev

Browse Source 
Significant speedup of tool panel/homepage loading
This commit is contained in:
John Chilton
2015-04-28 14:55:51 -05:00
parent 6e71a90cdd 911acd7a6e
commit 485bdafa35
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/toolbox/base.py
+22 -13
View File
@@ -53,6 +53,7 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
# shed_tool_conf.xml file.
self._dynamic_tool_confs = []
self._tools_by_id = {}
self._integrated_section_by_tool = {}
# Tool lineages can contain chains of related tools with different ids
# so each will be present once in the above dictionary. The following
# dictionary can instead hold multiple tools with different versions.
@@ -217,19 +218,10 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
def get_integrated_section_for_tool( self, tool ):
tool_id = tool.id
for key, item_type, item in self._integrated_tool_panel.panel_items_iter():
if item:
if item_type == panel_item_types.TOOL:
if item.id == tool_id:
return '', ''
if item_type == panel_item_types.SECTION:
section_id = item.id or ''
section_name = item.name or ''
for section_key, section_item_type, section_item in item.panel_items_iter():
if section_item_type == panel_item_types.TOOL:
if section_item:
if section_item.id == tool_id:
return section_id, section_name
if tool_id in self._integrated_section_by_tool:
return self._integrated_section_by_tool[tool_id]
return None, None
def __resolve_tool_path(self, tool_path, config_filename):
@@ -310,6 +302,7 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
tool_id = key.replace( 'tool_', '', 1 )
if tool_id in self._tools_by_id:
self.__add_tool_to_tool_panel( val, self._tool_panel, section=False )
self._integrated_section_by_tool[tool_id] = '', ''
elif item_type == panel_item_types.WORKFLOW:
workflow_id = key.replace( 'workflow_', '', 1 )
if workflow_id in self._workflows_by_id:
@@ -331,6 +324,7 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
tool_id = section_key.replace( 'tool_', '', 1 )
if tool_id in self._tools_by_id:
self.__add_tool_to_tool_panel( section_val, section, section=True )
self._integrated_section_by_tool[tool_id] = key, val.name
elif section_item_type == panel_item_types.WORKFLOW:
workflow_id = section_key.replace( 'workflow_', '', 1 )
if workflow_id in self._workflows_by_id:
@@ -552,10 +546,17 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
has_elems.insert( tool_panel_index,
replacement_tool_key,
replacement_tool_version )
self._integrated_section_by_tool[ tool_id ] = available_tool_section_id, available_tool_section_name
else:
del has_elems[ tool_key ]
if tool_id in self._integrated_section_by_tool:
del self._integrated_section_by_tool[ tool_id ]
else:
del has_elems[ tool_key ]
if tool_id in self._integrated_section_by_tool:
del self._integrated_section_by_tool[ tool_id ]
if remove_from_config:
itegrated_items = integrated_has_elems.panel_items()
if tool_key in itegrated_items:
@@ -681,6 +682,14 @@ class AbstractToolBox( object, Dictifiable, ManagesIntegratedToolPanelMixin ):
index=sub_index,
internal=True,
)
# Ensure each tool's section is stored
for section_key, section_item_type, section_item in integrated_elems.panel_items_iter():
if section_item_type == panel_item_types.TOOL:
if section_item:
tool_id = section_key.replace( 'tool_', '', 1 )
self._integrated_section_by_tool[tool_id] = integrated_section.id, integrated_section.name
if load_panel_dict:
self._tool_panel[ key ] = section
# Always load sections into the integrated_tool_panel.