refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
This commit is contained in:
Jonathan Warren
parent
f317fafbb3
commit
1b5158d658
|
|
@ -8,79 +8,92 @@ from namecoin import ensureNamecoinOptions
|
||||||
storeConfigFilesInSameDirectoryAsProgramByDefault = False # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
|
storeConfigFilesInSameDirectoryAsProgramByDefault = False # The user may de-select Portable Mode in the settings if they want the config files to stay in the application data folder.
|
||||||
|
|
||||||
def loadConfig():
|
def loadConfig():
|
||||||
# First try to load the config file (the keys.dat file) from the program
|
if shared.appdata:
|
||||||
# directory
|
|
||||||
shared.config.read('keys.dat')
|
|
||||||
try:
|
|
||||||
shared.config.get('bitmessagesettings', 'settingsversion')
|
|
||||||
print 'Loading config files from same directory as program'
|
|
||||||
shared.appdata = ''
|
|
||||||
except:
|
|
||||||
# Could not load the keys.dat file in the program directory. Perhaps it
|
|
||||||
# is in the appdata directory.
|
|
||||||
shared.appdata = shared.lookupAppdataFolder()
|
|
||||||
shared.config = ConfigParser.SafeConfigParser()
|
|
||||||
shared.config.read(shared.appdata + 'keys.dat')
|
shared.config.read(shared.appdata + 'keys.dat')
|
||||||
|
#shared.appdata must have been specified as a startup option.
|
||||||
try:
|
try:
|
||||||
shared.config.get('bitmessagesettings', 'settingsversion')
|
shared.config.get('bitmessagesettings', 'settingsversion')
|
||||||
print 'Loading existing config files from', shared.appdata
|
print 'Loading config files from directory specified on startup: ' + shared.appdata
|
||||||
|
needToCreateKeysFile = False
|
||||||
except:
|
except:
|
||||||
# This appears to be the first time running the program; there is
|
needToCreateKeysFile = True
|
||||||
# no config file (or it cannot be accessed). Create config file.
|
|
||||||
shared.config.add_section('bitmessagesettings')
|
|
||||||
shared.config.set('bitmessagesettings', 'settingsversion', '6')
|
|
||||||
shared.config.set('bitmessagesettings', 'port', '8444')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y %%I:%%M %%p')
|
|
||||||
shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
|
|
||||||
shared.config.set('bitmessagesettings', 'startonlogon', 'false')
|
|
||||||
if 'linux' in sys.platform:
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'minimizetotray', 'false')
|
|
||||||
# This isn't implimented yet and when True on
|
|
||||||
# Ubuntu causes Bitmessage to disappear while
|
|
||||||
# running when minimized.
|
|
||||||
else:
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'minimizetotray', 'true')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'showtraynotifications', 'true')
|
|
||||||
shared.config.set('bitmessagesettings', 'startintray', 'false')
|
|
||||||
shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'sockshostname', 'localhost')
|
|
||||||
shared.config.set('bitmessagesettings', 'socksport', '9050')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'socksauthentication', 'false')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'sockslisten', 'false')
|
|
||||||
shared.config.set('bitmessagesettings', 'socksusername', '')
|
|
||||||
shared.config.set('bitmessagesettings', 'sockspassword', '')
|
|
||||||
shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'messagesencrypted', 'false')
|
|
||||||
shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
|
|
||||||
shared.networkDefaultProofOfWorkNonceTrialsPerByte))
|
|
||||||
shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
|
|
||||||
shared.networkDefaultPayloadLengthExtraBytes))
|
|
||||||
shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
|
|
||||||
shared.config.set(
|
|
||||||
'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
|
|
||||||
shared.config.set('bitmessagesettings', 'dontconnect', 'true')
|
|
||||||
ensureNamecoinOptions()
|
|
||||||
|
|
||||||
if storeConfigFilesInSameDirectoryAsProgramByDefault:
|
else:
|
||||||
# Just use the same directory as the program and forget about
|
shared.config.read('keys.dat')
|
||||||
# the appdata folder
|
try:
|
||||||
shared.appdata = ''
|
shared.config.get('bitmessagesettings', 'settingsversion')
|
||||||
print 'Creating new config files in same directory as program.'
|
print 'Loading config files from same directory as program.'
|
||||||
else:
|
needToCreateKeysFile = False
|
||||||
print 'Creating new config files in', shared.appdata
|
shared.appdata = ''
|
||||||
if not os.path.exists(shared.appdata):
|
except:
|
||||||
os.makedirs(shared.appdata)
|
# Could not load the keys.dat file in the program directory. Perhaps it
|
||||||
if not sys.platform.startswith('win'):
|
# is in the appdata directory.
|
||||||
os.umask(0o077)
|
shared.appdata = shared.lookupAppdataFolder()
|
||||||
with open(shared.appdata + 'keys.dat', 'wb') as configfile:
|
shared.config.read(shared.appdata + 'keys.dat')
|
||||||
shared.config.write(configfile)
|
try:
|
||||||
|
shared.config.get('bitmessagesettings', 'settingsversion')
|
||||||
|
print 'Loading existing config files from', shared.appdata
|
||||||
|
needToCreateKeysFile = False
|
||||||
|
except:
|
||||||
|
needToCreateKeysFile = True
|
||||||
|
|
||||||
|
if needToCreateKeysFile:
|
||||||
|
# This appears to be the first time running the program; there is
|
||||||
|
# no config file (or it cannot be accessed). Create config file.
|
||||||
|
shared.config.add_section('bitmessagesettings')
|
||||||
|
shared.config.set('bitmessagesettings', 'settingsversion', '6')
|
||||||
|
shared.config.set('bitmessagesettings', 'port', '8444')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'timeformat', '%%a, %%d %%b %%Y %%I:%%M %%p')
|
||||||
|
shared.config.set('bitmessagesettings', 'blackwhitelist', 'black')
|
||||||
|
shared.config.set('bitmessagesettings', 'startonlogon', 'false')
|
||||||
|
if 'linux' in sys.platform:
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'minimizetotray', 'false')
|
||||||
|
# This isn't implimented yet and when True on
|
||||||
|
# Ubuntu causes Bitmessage to disappear while
|
||||||
|
# running when minimized.
|
||||||
|
else:
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'minimizetotray', 'true')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'showtraynotifications', 'true')
|
||||||
|
shared.config.set('bitmessagesettings', 'startintray', 'false')
|
||||||
|
shared.config.set('bitmessagesettings', 'socksproxytype', 'none')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'sockshostname', 'localhost')
|
||||||
|
shared.config.set('bitmessagesettings', 'socksport', '9050')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'socksauthentication', 'false')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'sockslisten', 'false')
|
||||||
|
shared.config.set('bitmessagesettings', 'socksusername', '')
|
||||||
|
shared.config.set('bitmessagesettings', 'sockspassword', '')
|
||||||
|
shared.config.set('bitmessagesettings', 'keysencrypted', 'false')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'messagesencrypted', 'false')
|
||||||
|
shared.config.set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(
|
||||||
|
shared.networkDefaultProofOfWorkNonceTrialsPerByte))
|
||||||
|
shared.config.set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(
|
||||||
|
shared.networkDefaultPayloadLengthExtraBytes))
|
||||||
|
shared.config.set('bitmessagesettings', 'minimizeonclose', 'false')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'maxacceptablenoncetrialsperbyte', '0')
|
||||||
|
shared.config.set(
|
||||||
|
'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
|
||||||
|
shared.config.set('bitmessagesettings', 'dontconnect', 'true')
|
||||||
|
ensureNamecoinOptions()
|
||||||
|
|
||||||
|
if storeConfigFilesInSameDirectoryAsProgramByDefault:
|
||||||
|
# Just use the same directory as the program and forget about
|
||||||
|
# the appdata folder
|
||||||
|
shared.appdata = ''
|
||||||
|
print 'Creating new config files in same directory as program.'
|
||||||
|
else:
|
||||||
|
print 'Creating new config files in', shared.appdata
|
||||||
|
if not os.path.exists(shared.appdata):
|
||||||
|
os.makedirs(shared.appdata)
|
||||||
|
if not sys.platform.startswith('win'):
|
||||||
|
os.umask(0o077)
|
||||||
|
with open(shared.appdata + 'keys.dat', 'wb') as configfile:
|
||||||
|
shared.config.write(configfile)
|
||||||
|
|
|
||||||
|
|
@ -270,7 +270,7 @@ def ensureNamecoinOptions ():
|
||||||
nmc.close ()
|
nmc.close ()
|
||||||
|
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print "Failure reading namecoin config file: %s" % str (exc)
|
print "Could not read the Namecoin config file probably because you don't have Namecoin installed. That's ok; we don't really need it. Detailed error message: %s" % str (exc)
|
||||||
|
|
||||||
# If still nothing found, set empty at least.
|
# If still nothing found, set empty at least.
|
||||||
if (not hasUser):
|
if (not hasUser):
|
||||||
|
|
|
||||||
Reference in New Issue
Block a user