erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (memory): cleaned the part for load/save to xml (not used)

Browse source
This commit is contained in:
souliane 2013-10-18 19:23:03 +02:00
commit 9c2087847a
1 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/memory/memory.py
View file

@ -32,7 +32,6 @@ from sat.memory.sqlite import SqliteStorage
from sat.memory.persistent import PersistentDict
from sat.core import exceptions
SAVEFILE_PARAM_XML = "/param" # xml parameters template
SAVEFILE_DATABASE = "/sat.db"
NO_SECURITY_LIMIT = -1
@ -137,7 +136,6 @@ class Params(object):
self.default_profile = None
self.params = {}
self.params_gen = {}
host.set_const('savefile_param_xml', SAVEFILE_PARAM_XML)
host.registerGeneralCB("registerNewAccount", host.registerNewAccountCB)
def createProfile(self, profile):
@ -603,7 +601,7 @@ class Memory(object):
self.initialized = defer.Deferred()
self.host = host
self.entitiesCache = {} # XXX: keep presence/last resource/other data in cache
# /!\ an entity is not necessarily in roster
# /!\ an entity is not necessarily in roster
self.subscriptions = {}
self.server_features = {} # used to store discovery's informations
self.server_identities = {}
@ -614,7 +612,8 @@ class Memory(object):
self.storage = SqliteStorage(database_file)
PersistentDict.storage = self.storage
self.params = Params(host, self.storage)
self.loadFiles()
info(_("Loading default params template"))
self.params.load_default_params()
d = self.storage.initialized.addCallback(lambda ignore: self.load())
self.memory_data = PersistentDict("memory")
d.addCallback(lambda ignore: self.memory_data.load())
@ -644,22 +643,19 @@ class Memory(object):
return os.path.expanduser(_value) if name.endswith('_path') or name.endswith('_dir') else _value
def loadFiles(self):
"""Load parameters and all memory things from file/db"""
param_file_xml = os.path.expanduser(self.getConfig('', 'local_dir') +
self.host.get_const('savefile_param_xml'))
#parameters template
if os.path.exists(param_file_xml):
def load_xml(self, filename):
"""Load parameters template from xml file"""
if filename is None:
return False
filename = os.path.expanduser(filename)
if os.path.exists(filename):
try:
self.params.load_xml(param_file_xml)
debug(_("params template loaded"))
self.params.load_xml(filename)
debug(_("Parameters loaded from file: %s") % filename)
return True
except Exception as e:
error(_("Can't load params template: %s") % (e, ))
self.params.load_default_params()
else:
info(_("No params template, using default template"))
self.params.load_default_params()
error(_("Can't load parameters from file: %s") % e)
return False
def load(self):
"""Load parameters and all memory things from db"""
@ -687,15 +683,19 @@ class Memory(object):
except KeyError:
error(_("Trying to purge roster status cache for a profile not in memory: [%s]") % profile)
def save(self):
"""Save parameters and all memory things to file/db"""
def save_xml(self, filename=None):
"""Save parameters template to xml file"""
if filename is None:
return False
#TODO: need to encrypt files (at least passwords !) and set permissions
param_file_xml = os.path.expanduser(self.getConfig('', 'local_dir') +
self.host.get_const('savefile_param_xml'))
# TODO: check if this method is still needed
#self.params.save_xml(param_file_xml)
debug(_("params saved"))
filename = os.path.expanduser(filename)
try:
self.params.save_xml(filename)
debug(_("Parameters saved to file: %s") % filename)
return True
except Exception as e:
error(_("Can't save parameters to file: %s") % e)
return False
def getProfilesList(self):
return self.storage.getProfilesList()