ENH: Guard for all exceptions in content decorators

kupfer/core/pluginload.py

@@ -54,7 +54,7 @@ def load_plugin(plugin_id):
     return desc
 
 @contextlib.contextmanager
-def exception_guard(name, callback=None, *args):
+def exception_guard(name, callback=None, *args, **kwargs):
     "Guard for exceptions, print traceback and call @callback if any is raised"
     try:
         yield
@@ -65,7 +65,7 @@ def exception_guard(name, callback=None, *args):
         pretty.print_error(__name__, "This error is probably a bug in", name)
         pretty.print_error(__name__, "Please file a bug report")
         if callback is not None:
-            callback(*args)
+            callback(*args, **kwargs)
 
 def remove_plugin(plugin_id):
     plugins.unimport_plugin(plugin_id)

kupfer/core/sources.py

@@ -479,8 +479,14 @@ def get_contents_for_leaf(self, leaf, types=None):
         for typ in self.content_decorators:
             if not isinstance(leaf, typ):
                 continue
-            for content in self.content_decorators[typ]:
-                dsrc = content.decorate_item(leaf)
+            for content in list(self.content_decorators[typ]):
+                dsrc = None
+                with pluginload.exception_guard(
+                        content,
+                        self._remove_source,
+                        content,
+                        is_decorator=True):
+                    dsrc = content.decorate_item(leaf)
                 if dsrc:
                     if types and not self.good_source_for_types(dsrc, types):
                         continue
@@ -573,11 +579,14 @@ def _try_restore(self, sources):
             if source:
                 yield source
 
-    def _remove_source(self, source):
+    def _remove_source(self, source, is_decorator=False):
         "Oust @source from catalog if any exception is raised"
-        self.sources.discard(source)
-        self.toplevel_sources.discard(source)
-        source_type = type(source)
+        if not is_decorator:
+            self.sources.discard(source)
+            self.toplevel_sources.discard(source)
+            source_type = type(source)
+        else:
+            source_type = source
         for typ in self.content_decorators:
             self.content_decorators[typ].discard(source_type)