AstralTransRocketries/mcedit
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch errors while importing filters and show an alert.

Browse Source
This commit is contained in:
David Vierra 2012-11-30 22:57:43 -10:00
parent ab541ed9ed
commit b19c64dca0
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editortools/filter.py
View File

@ -30,8 +30,8 @@ def alertFilterException(func):
try: try:
func(*args, **kw) func(*args, **kw)
except Exception, e: except Exception, e:
alert(u"Exception during filter operation. See console for details.\n\n{0}".format(e))
print traceback.format_exc() print traceback.format_exc()
alert(u"Exception during filter operation. See console for details.\n\n{0}".format(e))
return _func return _func
@ -348,6 +348,7 @@ class FilterTool(EditorTool):
self.editor.remove(self.panel) self.editor.remove(self.panel)
self.reloadFilters() self.reloadFilters()
#self.panel = FilterToolPanel(self) #self.panel = FilterToolPanel(self)
self.panel.reload() self.panel.reload()
@ -366,12 +367,24 @@ class FilterTool(EditorTool):
filterFiles = os.listdir(filterDir) filterFiles = os.listdir(filterDir)
filterPyfiles = filter(lambda x: x.endswith(".py"), filterFiles) filterPyfiles = filter(lambda x: x.endswith(".py"), filterFiles)
filterModules = (__import__(x[:-3]) for x in filterPyfiles) def tryImport(name):
try:
return __import__(name)
except Exception, e:
print traceback.format_exc()
alert(u"Exception while importing filter module {}. See console for details.\n\n{}".format(name, e))
return object()
filterModules = (tryImport(x[:-3]) for x in filterPyfiles)
filterModules = filter(lambda module: hasattr(module, "perform"), filterModules) filterModules = filter(lambda module: hasattr(module, "perform"), filterModules)
self.filterModules = dict((self.moduleDisplayName(x), x) for x in filterModules) self.filterModules = dict((self.moduleDisplayName(x), x) for x in filterModules)
[reload(m) for m in self.filterModules.itervalues()] for m in self.filterModules.itervalues():
filterModules = (__import__(x[:-3]) for x in filterPyfiles) try:
reload(m)
except Exception, e:
print traceback.format_exc()
alert(u"Exception while reloading filter module {}. Using previously loaded module. See console for details.\n\n{}".format(m.__file__, e))
@property @property
def filterNames(self): def filterNames(self):