bridge: core & frontend sides of bridge are now generated

frontends/src/bridge/DBus.py

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from bridge_frontend import BridgeFrontend
 import dbus, dbus.glib
+from logging import debug
 
 class BridgeExceptionNoService(Exception):
     pass
@@ -48,7 +49,126 @@ class DBusBridgeFrontend(BridgeFrontend):
         elif iface == "request":
             self.db_req_iface.connect_to_signal(functionName, handler)
 
-##METHODS_PART##
+    def addContact(self, entity, profile_key="@DEFAULT@"):
+        debug ("addContact")
+        return self.db_comm_iface.addContact(entity, profile_key)
+
+    def callMenu(self, category, name, menu_type, profile_key):
+        debug ("callMenu")
+        return self.db_req_iface.callMenu(category, name, menu_type, profile_key)
+
+    def confirmationAnswer(self, id, accepted, data):
+        debug ("confirmationAnswer")
+        return self.db_req_iface.confirmationAnswer(id, accepted, data)
+
+    def connect(self, profile_key="@DEFAULT@"):
+        debug ("connect")
+        return self.db_comm_iface.connect(profile_key)
+
+    def createProfile(self, profile):
+        debug ("createProfile")
+        return self.db_req_iface.createProfile(profile)
+
+    def delContact(self, entity, profile_key="@DEFAULT@"):
+        debug ("delContact")
+        return self.db_comm_iface.delContact(entity, profile_key)
+
+    def deleteProfile(self, profile):
+        debug ("deleteProfile")
+        return self.db_req_iface.deleteProfile(profile)
+
+    def disconnect(self, profile_key="@DEFAULT@"):
+        debug ("disconnect")
+        return self.db_comm_iface.disconnect(profile_key)
+
+    def getContacts(self, profile_key="@DEFAULT@"):
+        debug ("getContacts")
+        return self.db_comm_iface.getContacts(profile_key)
+
+    def getHistory(self, from_jid, to_jid, size):
+        debug ("getHistory")
+        return self.db_comm_iface.getHistory(from_jid, to_jid, size)
+
+    def getMenuHelp(self, category, name, menu_type):
+        debug ("getMenuHelp")
+        return self.db_req_iface.getMenuHelp(category, name, menu_type)
+
+    def getMenus(self, ):
+        debug ("getMenus")
+        return self.db_req_iface.getMenus()
+
+    def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
+        debug ("getParamA")
+        return self.db_comm_iface.getParamA(name, category, attribute, profile_key)
+
+    def getParams(self, profile_key="@DEFAULT@"):
+        debug ("getParams")
+        return self.db_comm_iface.getParams(profile_key)
+
+    def getParamsCategories(self, ):
+        debug ("getParamsCategories")
+        return self.db_comm_iface.getParamsCategories()
+
+    def getParamsForCategory(self, category, profile_key="@DEFAULT@"):
+        debug ("getParamsForCategory")
+        return self.db_comm_iface.getParamsForCategory(category, profile_key)
+
+    def getParamsUI(self, profile_key="@DEFAULT@"):
+        debug ("getParamsUI")
+        return self.db_comm_iface.getParamsUI(profile_key)
+
+    def getPresenceStatus(self, profile_key="@DEFAULT@"):
+        debug ("getPresenceStatus")
+        return self.db_comm_iface.getPresenceStatus(profile_key)
+
+    def getProfileName(self, profile_key="@DEFAULT@"):
+        debug ("getProfileName")
+        return self.db_req_iface.getProfileName(profile_key)
+
+    def getProfilesList(self, ):
+        debug ("getProfilesList")
+        return self.db_req_iface.getProfilesList()
+
+    def getProgress(self, id):
+        debug ("getProgress")
+        return self.db_req_iface.getProgress(id)
+
+    def getVersion(self, ):
+        debug ("getVersion")
+        return self.db_req_iface.getVersion()
+
+    def getWaitingSub(self, profile_key="@DEFAULT@"):
+        debug ("getWaitingSub")
+        return self.db_comm_iface.getWaitingSub(profile_key)
+
+    def isConnected(self, profile_key="@DEFAULT@"):
+        debug ("isConnected")
+        return self.db_comm_iface.isConnected(profile_key)
+
+    def launchAction(self, action_type, data, profile_key="@DEFAULT@"):
+        debug ("launchAction")
+        return self.db_req_iface.launchAction(action_type, data, profile_key)
+
+    def registerNewAccount(self, login, password, host, port=5222):
+        debug ("registerNewAccount")
+        return self.db_comm_iface.registerNewAccount(login, password, host, port)
+
+    def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"):
+        debug ("sendMessage")
+        return self.db_comm_iface.sendMessage(to_jid, message, subject, mess_type, profile_key)
+
+    def setParam(self, name, value, category, profile_key="@DEFAULT@"):
+        debug ("setParam")
+        return self.db_comm_iface.setParam(name, value, category, profile_key)
+
+    def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"):
+        debug ("setPresence")
+        return self.db_comm_iface.setPresence(to_jid, show, priority, statuses, profile_key)
+
+    def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
+        debug ("subscription")
+        return self.db_comm_iface.subscription(sub_type, entity, profile_key)
+
 
 #methods from plugins
     def getRoomJoined(self, profile_key='@DEFAULT@'):
@@ -95,4 +215,3 @@ class DBusBridgeFrontend(BridgeFrontend):
             data = [('', '')] #XXX: we have to do this awful hack because python dbus need to guess the signature
         return self.db_req_iface.gatewayRegister(action, target, data, profile_key)
 
-

frontends/src/quick_frontend/quick_app.py

@@ -119,9 +119,9 @@ class QuickApp():
             self.profile = profile
         
         ###now we get the essential params###
-        self.profiles[profile]['whoami']=JID(self.bridge.getParamA("JabberID","Connection", profile))
-        autoconnect = self.bridge.getParamA("autoconnect","Connection", profile) == "true"
-        self.profiles[profile]['watched']=self.bridge.getParamA("Watched", "Misc", profile).split() #TODO: put this in a plugin
+        self.profiles[profile]['whoami']=JID(self.bridge.getParamA("JabberID","Connection", profile_key=profile))
+        autoconnect = self.bridge.getParamA("autoconnect","Connection", profile_key=profile) == "true"
+        self.profiles[profile]['watched']=self.bridge.getParamA("Watched", "Misc", profile_key=profile).split() #TODO: put this in a plugin
 
         ## misc ##
         self.profiles[profile]['onlineContact'] = set()  #FIXME: temporary
@@ -440,7 +440,7 @@ class QuickApp():
         """Must be called when the frontend is terminating"""
         #TODO: mange multi-profile here
         try:
-            autodisconnect = self.bridge.getParamA("autodisconnect","Connection", self.profile) == "true"
+            autodisconnect = self.bridge.getParamA("autodisconnect","Connection", profile_key=self.profile) == "true"
             if autodisconnect and self.bridge.isConnected(self.profile):
                 #Does the user want autodisconnection ?
                 self.bridge.disconnect(self.profile)