Bitmessage/PyBitmessage-2024-12-20
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable #441

Merged
Atheros1 merged 1 commits from master into master 2013-08-26 01:00:05 +02:00
Conversation 0 Commits 1 Files Changed 2 +85 -72
2 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/helper_startup.py
View File

@ -8,23 +8,36 @@ 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(shared.appdata + 'keys.dat')
#shared.appdata must have been specified as a startup option.
try:
shared.config.get('bitmessagesettings', 'settingsversion')
print 'Loading config files from directory specified on startup: ' + shared.appdata
needToCreateKeysFile = False
except:
needToCreateKeysFile = True
else:
shared.config.read('keys.dat') shared.config.read('keys.dat')
try: try:
shared.config.get('bitmessagesettings', 'settingsversion') shared.config.get('bitmessagesettings', 'settingsversion')
print 'Loading config files from same directory as program' print 'Loading config files from same directory as program.'
needToCreateKeysFile = False
shared.appdata = '' shared.appdata = ''
except: except:
# Could not load the keys.dat file in the program directory. Perhaps it # Could not load the keys.dat file in the program directory. Perhaps it
# is in the appdata directory. # is in the appdata directory.
shared.appdata = shared.lookupAppdataFolder() shared.appdata = shared.lookupAppdataFolder()
shared.config = ConfigParser.SafeConfigParser()
shared.config.read(shared.appdata + 'keys.dat') shared.config.read(shared.appdata + 'keys.dat')
try: try:
shared.config.get('bitmessagesettings', 'settingsversion') shared.config.get('bitmessagesettings', 'settingsversion')
print 'Loading existing config files from', shared.appdata print 'Loading existing config files from', shared.appdata
needToCreateKeysFile = False
except: except:
needToCreateKeysFile = True
if needToCreateKeysFile:
# This appears to be the first time running the program; there is # This appears to be the first time running the program; there is
# no config file (or it cannot be accessed). Create config file. # no config file (or it cannot be accessed). Create config file.
shared.config.add_section('bitmessagesettings') shared.config.add_section('bitmessagesettings')

2
src/namecoin.py
View File

@ -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):