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

Set dontconnect temporary, completely avoiding saving

Browse Source
This commit is contained in:
Dmitri Bogomolov 2019-09-05 18:31:16 +03:00
parent df66277e2d
commit 24ae91ad0a
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitmessageqt/settings.py
View File

@ -490,11 +490,11 @@ class SettingsDialog(QtGui.QDialog):
if self.net_restart_needed: if self.net_restart_needed:
self.net_restart_needed = False self.net_restart_needed = False
self.config.set('bitmessagesettings', 'dontconnect', 'true') self.config.setTemp('bitmessagesettings', 'dontconnect', 'true')
self.timer.singleShot( self.timer.singleShot(
5000, lambda: 5000, lambda:
self.config.remove_option( self.config.setTemp(
'bitmessagesettings', 'dontconnect') 'bitmessagesettings', 'dontconnect', 'false')
) )
self.parent.updateStartOnLogon() self.parent.updateStartOnLogon()

13
src/bmconfigparser.py
View File

@ -46,6 +46,8 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
"""Singleton class inherited from ConfigParser.SafeConfigParser """Singleton class inherited from ConfigParser.SafeConfigParser
with additional methods specific to bitmessage config.""" with additional methods specific to bitmessage config."""
_temp = {}
def set(self, section, option, value=None): def set(self, section, option, value=None):
if self._optcre is self.OPTCRE or value: if self._optcre is self.OPTCRE or value:
if not isinstance(value, basestring): if not isinstance(value, basestring):
@ -59,6 +61,10 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
if section == "bitmessagesettings" and option == "timeformat": if section == "bitmessagesettings" and option == "timeformat":
return ConfigParser.ConfigParser.get( return ConfigParser.ConfigParser.get(
self, section, option, raw, variables) self, section, option, raw, variables)
try:
return self._temp[section][option]
except KeyError:
pass
return ConfigParser.ConfigParser.get( return ConfigParser.ConfigParser.get(
self, section, option, True, variables) self, section, option, True, variables)
except ConfigParser.InterpolationError: except ConfigParser.InterpolationError:
@ -70,6 +76,13 @@ class BMConfigParser(ConfigParser.SafeConfigParser):
except (KeyError, ValueError, AttributeError): except (KeyError, ValueError, AttributeError):
raise e raise e
def setTemp(self, section, option, value=None):
"""Temporary set option to value, not saving."""
try:
self._temp[section][option] = value
except KeyError:
self._temp[section] = {option: value}
def safeGetBoolean(self, section, field): def safeGetBoolean(self, section, field):
try: try:
return self.getboolean(section, field) return self.getboolean(section, field)