pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always sort plugins by their identifier by default

Browse source
This commit is contained in:
Gina Häußge 2015-09-04 15:38:15 +02:00
parent 2a52b6d1a2
commit 5863f99b75
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/octoprint/plugin/core.py
View file

@ -1071,22 +1071,17 @@ class PluginManager(object):
if result is None:
return []
found_implementations = [impl[1] for impl in result]
def sort_func(impl):
sorting_value = None
if sorting_context is not None and isinstance(impl[1], SorteablePlugin):
try:
sorting_value = impl[1].get_sorting_key(sorting_context)
except:
self.logger.exception("Error while trying to retrieve sorting order for plugin {}".format(impl[0]))
if sorting_context is not None:
def sort_func(impl):
sorting_value = None
if isinstance(impl, SorteablePlugin):
try:
sorting_value = impl.get_sorting_key(sorting_context)
except:
self.logger.exception("Error while trying to retrieve sorting order for plugin {}".format(impl._identifier))
return sorting_value is None, sorting_value, impl[0]
return sorting_value is None, sorting_value
found_implementations = sorted(found_implementations, key=sort_func)
return found_implementations
return [impl[1] for impl in sorted(result, key=sort_func)]
def get_filtered_implementations(self, f, sorting_context=None, *types):
"""