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

PMGR: Also allow filtering notices against affected OctoPrint versions

Browse source
This commit is contained in:
Gina Häußge 2017-03-31 17:32:41 +02:00
parent 52633d0433
commit d27dd26a61
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/plugins/pluginmanager/__init__.py
View file

@ -820,21 +820,26 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
def _get_notifications(self, plugin):
key = plugin.key
if not plugin.enabled:
return
if key not in self._notices:
return
octoprint_version = self._get_octoprint_version(base=True)
plugin_notifications = self._notices.get(key, [])
def filter_versions(notification):
def filter_relevant(notification):
return "text" in notification and "date" in notification and \
("versions" not in notification or plugin.version in notification["versions"])
("versions" not in notification or plugin.version in notification["versions"]) and \
("octoversions" not in notification or self._is_octoprint_compatible(octoprint_version, notification["octoversions"]))
def map_notification(notification):
return self._to_external_notification(key, notification)
return filter(lambda x: x is not None,
map(map_notification,
filter(filter_versions,
filter(filter_relevant,
plugin_notifications)))
def _to_external_notification(self, key, notification):