catdog2/urlbot-native-trex
1
0
Fork 0
mirror of http://aero2k.de/t/repos/urlbot-native.git synced 2017-09-06 15:25:38 +02:00
Code Issues Releases Activity

Fix handling of persistant storage if no persistant storage exists yet

Browse Source
This commit is contained in:
Peter Dahlberg
2015-02-05 18:38:28 +01:00
parent 0ae9a6ba66
commit 8fe1e1b39d
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common.py
View File

@@ -5,7 +5,7 @@ if '__main__' == __name__:
print('''this is a library file, which is not meant to be executed''') print('''this is a library file, which is not meant to be executed''')
exit(-1) exit(-1)
import sys, time, pickle import sys, time, pickle, os
from local_config import conf from local_config import conf
RATE_GLOBAL = 0x01 RATE_GLOBAL = 0x01
@@ -36,9 +36,13 @@ def conf_save(obj):
return pickle.dump(obj, fd) return pickle.dump(obj, fd)
def conf_load(): def conf_load():
with open(conf('persistent_storage'), 'rb') as fd: path = conf('persistent_storage')
if os.path.isfile(path):
with open(path, 'rb') as fd:
fd.seek(0) fd.seek(0)
return pickle.load(fd) return pickle.load(fd)
else:
return {}
def get_version_git(): def get_version_git():
import subprocess import subprocess

7
plugins.py
View File

@@ -441,12 +441,13 @@ def command_usersetting(argv, **args):
set_conf('persistent_locked', True) set_conf('persistent_locked', True)
blob = conf_load() blob = conf_load()
if 'user_pref' not in blob:
blob['user_pref'] = {}
if not arg_user in blob['user_pref']: if not arg_user in blob['user_pref']:
blob['user_pref'][arg_user] = {} blob['user_pref'][arg_user] = {}
blob['user_pref'][arg_user][arg_key] = ( blob['user_pref'][arg_user][arg_key] = 'on' == arg_val
True if 'on' == arg_val else False
)
conf_save(blob) conf_save(blob)
set_conf('persistent_locked', False) set_conf('persistent_locked', False)

2
urlbot.py
View File

@@ -229,7 +229,7 @@ def handle_msg(msg_obj):
return return
arg_user = msg_obj['mucnick'] arg_user = msg_obj['mucnick']
blob_userpref = conf_load()['user_pref'] blob_userpref = conf_load().get('user_pref',[])
nospoiler = False nospoiler = False
if arg_user in blob_userpref: if arg_user in blob_userpref: