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

Added an additional unless function to UiPlugin

Browse source 
Allows overriding adding a potentially invalid config to the
preemptive cache for a plugin.
This commit is contained in:
Gina Häußge 2015-07-09 15:43:11 +02:00
parent 54fe75fb4e
commit cfce3713fe
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/plugin/types.py
View file

@ -765,6 +765,9 @@ class UiPlugin(OctoPrintPlugin, SortablePlugin):
"""
return None
def get_ui_additional_unless(self):
return False
class WizardPlugin(OctoPrintPlugin, ReloadNeedingPlugin):
"""
The ``WizardPlugin`` mixin allows plugins to report to OctoPrint whether

14
src/octoprint/server/views.py
View file

@ -51,7 +51,7 @@ def index():
now = datetime.datetime.utcnow()
render_kwargs = _get_render_kwargs(_templates, _plugin_names, _plugin_vars, now)
def get_preemptively_cached_view(key, view, data=None, additional_request_data=None):
def get_preemptively_cached_view(key, view, data=None, additional_request_data=None, additional_unless=None):
if (data is None and additional_request_data is None) or g.locale is None:
return view
@ -85,10 +85,17 @@ def index():
except:
_logger.exception("Error retrieving additional data for preemptive cache from plugin {}".format(key))
def unless():
disabled_for_root = request.url_root in settings().get(["server", "preemptiveCache", "exceptions"])
if callable(additional_unless):
return disabled_for_root or additional_unless()
else:
return disabled_for_root
# finally decorate our view
return util.flask.preemptively_cached(cache=preemptiveCache,
data=d,
unless=lambda: request.url_root in settings().get(["server", "preemptiveCache", "exceptions"]))(view)
unless=unless)(view)
def get_cached_view(key, view, additional_key_data=None, additional_files=None, custom_files=None, custom_etag=None, custom_lastmodified=None):
def cache_key():
@ -206,7 +213,8 @@ def index():
preemptively_cached = get_preemptively_cached_view(plugin._identifier,
cached,
plugin.get_ui_data_for_preemptive_caching,
plugin.get_ui_additional_request_data_for_preemptive_caching)
plugin.get_ui_additional_request_data_for_preemptive_caching,
plugin.get_ui_additional_unless)
response = preemptively_cached(now, request, render_kwargs)
if response is not None: