From: <Z3...@us...> - 2010-12-24 00:16:37
|
Revision: 322 http://spd.svn.sourceforge.net/spd/?rev=322&view=rev Author: Z3po Date: 2010-12-24 00:16:30 +0000 (Fri, 24 Dec 2010) Log Message: ----------- bugfix. It was impossible to create a default config Modified Paths: -------------- branches/spd-ng/src/spdCheck.py branches/spd-ng/src/spdConfig.py branches/spd-ng/src/spdInterface.py Added Paths: ----------- branches/spd-ng/src/spd branches/spd-ng/src/spd-cli Added: branches/spd-ng/src/spd =================================================================== --- branches/spd-ng/src/spd (rev 0) +++ branches/spd-ng/src/spd 2010-12-24 00:16:30 UTC (rev 322) @@ -0,0 +1,6 @@ +#!/usr/bin/python + +import spdInterface + +Interface = spdInterface.Interface() +Interface.main() Property changes on: branches/spd-ng/src/spd ___________________________________________________________________ Added: svn:executable + * Added: branches/spd-ng/src/spd-cli =================================================================== --- branches/spd-ng/src/spd-cli (rev 0) +++ branches/spd-ng/src/spd-cli 2010-12-24 00:16:30 UTC (rev 322) @@ -0,0 +1,6 @@ +#!/usr/bin/python + +import spdInterface + +Interface = spdInterface.Interface(clientmode='CLI') +Interface.main() Property changes on: branches/spd-ng/src/spd-cli ___________________________________________________________________ Added: svn:executable + * Modified: branches/spd-ng/src/spdCheck.py =================================================================== --- branches/spd-ng/src/spdCheck.py 2010-12-11 00:40:20 UTC (rev 321) +++ branches/spd-ng/src/spdCheck.py 2010-12-24 00:16:30 UTC (rev 322) @@ -27,6 +27,23 @@ sys.exit(2) # }}} + def __oldSPDCheck(self): # {{{ + __oldspdconfig = '~/.spd/spd.conf' + if os.access(os.path.expanduser(__oldspdconfig), os.R_OK): + print 'old config found' + + # }}} + + def __createDefaultConfig(self,config): # {{{ + """Create the default config here. + # config: the configparser to use""" + + config.addConfigSection('Main') + config.setConfigVersion('0.3-alpha') + config.setClientmode('CLI') + # }}} + + def startupCheck(self): # {{{ """Do initial checks""" @@ -40,7 +57,10 @@ reval, version = config.getConfigVersion(raw=True) if reval > 0 and reval < 64: - Defaults.createDefaultConfig(config) + self.__oldSPDCheck() + self.__createDefaultConfig(config) + return self.startupCheck() + elif reval == 64: print 'ConfigVersion not found...setting Default one\n' config.setConfigVersion('0.3-alpha') @@ -61,19 +81,5 @@ # }}} -class Defaults(object): # {{{ - """Class to create default values.""" - - def createDefaultConfig(self,config): # {{{ - """Create the default config here. - # config: the configparser to use""" - - config.addConfigSection('Main') - config.setConfigVersion('0.3-alpha') - config.setClientmode('CLI') - # }}} - -# }}} - # EOF # vim:foldmethod=marker:tabstop=3:autoindent:shiftwidth=3 Modified: branches/spd-ng/src/spdConfig.py =================================================================== --- branches/spd-ng/src/spdConfig.py 2010-12-11 00:40:20 UTC (rev 321) +++ branches/spd-ng/src/spdConfig.py 2010-12-24 00:16:30 UTC (rev 322) @@ -43,17 +43,17 @@ """Is the Config file readable?""" reval = self.__checkConfigFileExist() + config = RawConfigParser() if reval > 0: - return reval, None + return reval, config - config = RawConfigParser() if os.access(self.configfile,os.R_OK): config.read(self.configfile) return 0,config else: - return 4, None + return 4, config # }}} def __checkConfigFileWriteable(self): # {{{ @@ -62,13 +62,19 @@ reval = self.__checkConfigFileExist() if reval > 0: - return reval, None + try: + configfile = open(self.configfile, 'wb') + except IOError: + return 8, configfile + else: + return 0, configfile if os.access(self.configfile,os.W_OK): configfile = open(self.configfile, 'wb') - return 0, configfile else: return 8, None + + return 0, configfile # }}} def __writeConfigFile(self,config): # {{{ @@ -91,11 +97,11 @@ reval, config = self.__checkConfigFileReadable() if reval > 0: - return reval, None + return reval, config if config.has_section(section): return 0, config - + return 32, config # }}} @@ -103,9 +109,9 @@ """create a section if its not in configfile. # section: the section to create.""" - reval, config = self.__hasSection() + reval, config = self.__hasSection(section) - if reval > 0 and reval < 32: + if reval > 0 and reval < 32 and reval is not 2: return reval config.add_section(section) @@ -208,8 +214,8 @@ # }}} - def addConfigSection(self): # {{{ - reval = self.__addSection('Main') + def addConfigSection(self,section): # {{{ + reval = self.__addSection(section) if reval > 0: self.__ErrorHandler(self.ReturnCodes[reval]) Modified: branches/spd-ng/src/spdInterface.py =================================================================== --- branches/spd-ng/src/spdInterface.py 2010-12-11 00:40:20 UTC (rev 321) +++ branches/spd-ng/src/spdInterface.py 2010-12-24 00:16:30 UTC (rev 322) @@ -20,7 +20,7 @@ self.version = initcheck['version'] if not clientmode: - clientmode = initcheck['clientmode'] + clientmode = initcheck['clientmode'] del initcheck This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |