citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

helper_startup formating

This commit is contained in:
Mahendra 2018-04-07 13:35:31 +05:30
parent 498557a6d6
commit a012d4a707
No known key found for this signature in database
GPG Key ID: A672D8FAAEE398B3
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/helper_startup.py
View File

@ -1,11 +1,10 @@
"""Helper Start performs all the startup operations."""
import ConfigParser
from bmconfigparser import BMConfigParser
import defaults
import sys
import os
import locale
import random
import string
import platform
from distutils.version import StrictVersion
@ -14,7 +13,10 @@ import paths
import state
import helper_random
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 _loadTrustedPeer():
try:
@ -27,15 +29,16 @@ def _loadTrustedPeer():
host, port = trustedPeer.split(':')
state.trustedPeer = state.Peer(host, int(port))
def loadConfig():
if state.appdata:
BMConfigParser().read(state.appdata + 'keys.dat')
#state.appdata must have been specified as a startup option.
# state.appdata must have been specified as a startup option.
try:
BMConfigParser().get('bitmessagesettings', 'settingsversion')
print 'Loading config files from directory specified on startup: ' + state.appdata
needToCreateKeysFile = False
except:
except Exception:
needToCreateKeysFile = True
else:
@ -45,16 +48,16 @@ def loadConfig():
print 'Loading config files from same directory as program.'
needToCreateKeysFile = False
state.appdata = paths.lookupExeFolder()
except:
# Could not load the keys.dat file in the program directory. Perhaps it
# is in the appdata directory.
except Exception:
# Could not load the keys.dat file in the program directory.
# Perhaps it is in the appdata directory.
state.appdata = paths.lookupAppdataFolder()
BMConfigParser().read(state.appdata + 'keys.dat')
try:
BMConfigParser().get('bitmessagesettings', 'settingsversion')
print 'Loading existing config files from', state.appdata
needToCreateKeysFile = False
except:
except Exception:
needToCreateKeysFile = True
if needToCreateKeysFile:
@ -110,7 +113,6 @@ def loadConfig():
BMConfigParser().set('bitmessagesettings', 'maxuploadrate', '0')
BMConfigParser().set('bitmessagesettings', 'maxoutboundconnections', '8')
BMConfigParser().set('bitmessagesettings', 'ttl', '367200')
#start:UI setting to stop trying to send messages after X days/months
BMConfigParser().set(
'bitmessagesettings', 'stopresendingafterxdays', '')
@ -145,9 +147,9 @@ def loadConfig():
def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
try:
if sys.platform[0:3]=="win":
VER_THIS=StrictVersion(platform.version())
if sys.platform[0:3] == "win":
VER_THIS = StrictVersion(platform.version())
return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
return False
except Exception as err:
except Exception:
return False