memory, jp: added jp commands to load/save parameters template

src/bridge/DBus.py

@@ -385,6 +385,12 @@ class DbusObject(dbus.service.Object):
     def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None):
         return self._callback("launchAction", unicode(callback_id), data, unicode(profile_key), callback=callback, errback=errback)
 
+    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
+                         in_signature='s', out_signature='b',
+                         async_callbacks=None)
+    def loadParamsTemplate(self, filename):
+        return self._callback("loadParamsTemplate", unicode(filename))
+
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='sis', out_signature='',
                          async_callbacks=None)
@@ -397,6 +403,12 @@ class DbusObject(dbus.service.Object):
     def registerNewAccount(self, login, password, email, host, port=5222):
         return self._callback("registerNewAccount", unicode(login), unicode(password), unicode(email), unicode(host), port)
 
+    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
+                         in_signature='s', out_signature='b',
+                         async_callbacks=None)
+    def saveParamsTemplate(self, filename):
+        return self._callback("saveParamsTemplate", unicode(filename))
+
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ssssa{ss}s', out_signature='',
                          async_callbacks=('callback', 'errback'))

src/bridge/bridge_constructor/bridge_template.ini

@@ -628,3 +628,21 @@ doc=Discover items of an entity
 doc_param_0=entity_jid: JID to discover
 doc_param_1=%(doc_profile_key)s
 doc_return=array of tuple (entity, node identifier, name)
+
+[saveParamsTemplate]
+type=method
+category=core
+sig_in=s
+sig_out=b
+doc=Save parameters template to xml file
+doc_param_0=filename: output filename
+doc_return=boolean (True in case of success)
+
+[loadParamsTemplate]
+type=method
+category=core
+sig_in=s
+sig_out=b
+doc=Load parameters template from xml file
+doc_param_0=filename: input filename
+doc_return=boolean (True in case of success)

src/core/sat_main.py

@@ -133,6 +133,8 @@ class SAT(service.Service):
         self.bridge.register("getMenuHelp", self.getMenuHelp)
         self.bridge.register("discoInfos", self.memory.disco._discoInfos)
         self.bridge.register("discoItems", self.memory.disco._discoItems)
+        self.bridge.register("saveParamsTemplate", self.memory.save_xml)
+        self.bridge.register("loadParamsTemplate", self.memory.load_xml)
 
         self.memory.initialized.addCallback(self._postMemoryInit)
 

src/memory/memory.py

@@ -207,8 +207,12 @@ class Memory(object):
         return value
 
     def load_xml(self, filename):
-        """Load parameters template from xml file"""
-        if filename is None:
+        """Load parameters template from xml file
+
+        @param filename (str): input file
+        @return bool: True in case of success
+        """
+        if not filename:
             return False
         filename = os.path.expanduser(filename)
         if os.path.exists(filename):
@@ -246,9 +250,13 @@ class Memory(object):
         except KeyError:
             log.error(_("Trying to purge roster status cache for a profile not in memory: [%s]") % profile)
 
-    def save_xml(self, filename=None):
-        """Save parameters template to xml file"""
-        if filename is None:
+    def save_xml(self, filename):
+        """Save parameters template to xml file
+
+        @param filename (str): output file
+        @return bool: True in case of success
+        """
+        if not filename:
             return False
         #TODO: need to encrypt files (at least passwords !) and set permissions
         filename = os.path.expanduser(filename)

src/memory/params.py

@@ -90,7 +90,7 @@ class Params(object):
             self._mergeParams(source_map[node_key], dest_map[node_key])
 
     def load_xml(self, xml_file):
-        """Load parameters template from file"""
+        """Load parameters template from xml file"""
         self.dom = minidom.parse(xml_file)
         default_dom = minidom.parseString(Params.default_xml.encode('utf-8'))
         self._mergeParams(default_dom.documentElement, self.dom.documentElement)