--- nfo/projects/netfraggle/bin/FraggleCtlModules.py 2004/09/05 00:21:10 1.4 +++ nfo/projects/netfraggle/bin/FraggleCtlModules.py 2004/09/05 12:17:20 1.5 @@ -13,31 +13,43 @@ def __init__(self,parent): self.modules = self.ScanModules() self.engine = parent + self.modfile = os.path.join(self.engine.getDefaultDir(), 'modules.xml') pass + def SaveModules(self,lmodules): + fraggleXml = fraggleParserXML.create(self) + fraggleXml.marshalXML(lmodules,self.modfile) + + def LoadModules(self): + fraggleXml = fraggleParserXML.create(self) + return fraggleXml.unmarshalXML(self.modfile) + def ScanModules(self): os.chdir('..') self.dir = os.listdir(os.path.join(os.getcwd(),'modules')) for i in self.dir: self.dir[self.dir.index(i)] = string.rstrip(i,'.py') + import re + regexp = re.compile('CVS$') + #print self.dir if len(self.dir) != 0: try: for i in self.dir: + if regexp.match(i) == None: + try: + fmodules[i] = i + except NameError: + fmodules = {i:i} + #print fmodules try: - fmodules[i] = i - except NameError: - fmodules = {i:i} - print fmodules - print self.dir - - #del fmodules['CVS'] - return fmodules + return fmodules + except UnboundLocalError: + return None except ImportError: pass - return None