core: plugins refactored according to bridge + updatedValue now use profile
This commit is contained in:
parent
b3322dabae
commit
ad29111416
2 changed files with 164 additions and 155 deletions
|
|
@ -21,12 +21,12 @@ 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
|
||||
from logging import debug, error
|
||||
|
||||
const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
|
||||
const_OBJ_PATH = '/org/goffi/SAT/bridge'
|
||||
const_COMM_SUFFIX = ".communication"
|
||||
const_REQ_SUFFIX = ".request"
|
||||
const_CORE_SUFFIX = ".core"
|
||||
const_PLUGIN_SUFFIX = ".plugin"
|
||||
|
||||
class BridgeExceptionNoService(Exception):
|
||||
pass
|
||||
|
|
@ -37,194 +37,196 @@ class DBusBridgeFrontend(BridgeFrontend):
|
|||
self.sessions_bus = dbus.SessionBus()
|
||||
self.db_object = self.sessions_bus.get_object(const_INT_PREFIX,
|
||||
const_OBJ_PATH)
|
||||
self.db_comm_iface = dbus.Interface(self.db_object,
|
||||
dbus_interface=const_INT_PREFIX + const_COMM_SUFFIX)
|
||||
self.db_req_iface = dbus.Interface(self.db_object,
|
||||
dbus_interface=const_INT_PREFIX + const_REQ_SUFFIX)
|
||||
self.db_core_iface = dbus.Interface(self.db_object,
|
||||
dbus_interface=const_INT_PREFIX + const_CORE_SUFFIX)
|
||||
self.db_plugin_iface = dbus.Interface(self.db_object,
|
||||
dbus_interface=const_INT_PREFIX + const_PLUGIN_SUFFIX)
|
||||
except dbus.exceptions.DBusException,e:
|
||||
if e._dbus_error_name=='org.freedesktop.DBus.Error.ServiceUnknown':
|
||||
raise BridgeExceptionNoService
|
||||
else:
|
||||
raise e
|
||||
#props = self.db_comm_iface.getProperties()
|
||||
#props = self.db_core_iface.getProperties()
|
||||
|
||||
def register(self, functionName, handler, iface="communication"):
|
||||
if iface == "communication":
|
||||
self.db_comm_iface.connect_to_signal(functionName, handler)
|
||||
elif iface == "request":
|
||||
self.db_req_iface.connect_to_signal(functionName, handler)
|
||||
def register(self, functionName, handler, iface="core"):
|
||||
if iface == "core":
|
||||
self.db_core_iface.connect_to_signal(functionName, handler)
|
||||
elif iface == "plugin":
|
||||
self.db_plugin_iface.connect_to_signal(functionName, handler)
|
||||
else:
|
||||
error(_('Unknown interface'))
|
||||
|
||||
def addContact(self, entity, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.addContact(entity, profile_key)
|
||||
return self.db_core_iface.addContact(entity, profile_key)
|
||||
|
||||
def asyncConnect(self, profile_key="@DEFAULT@", callback=None, errback=None):
|
||||
return self.db_comm_iface.asyncConnect(profile_key, reply_handler=callback, error_handler=errback)
|
||||
return self.db_core_iface.asyncConnect(profile_key, reply_handler=callback, error_handler=errback)
|
||||
|
||||
def callMenu(self, category, name, menu_type, profile_key):
|
||||
return unicode(self.db_req_iface.callMenu(category, name, menu_type, profile_key))
|
||||
return unicode(self.db_core_iface.callMenu(category, name, menu_type, profile_key))
|
||||
|
||||
def confirmationAnswer(self, id, accepted, data):
|
||||
return self.db_req_iface.confirmationAnswer(id, accepted, data)
|
||||
return self.db_core_iface.confirmationAnswer(id, accepted, data)
|
||||
|
||||
def connect(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.connect(profile_key)
|
||||
return self.db_core_iface.connect(profile_key)
|
||||
|
||||
def createProfile(self, profile):
|
||||
return self.db_req_iface.createProfile(profile)
|
||||
return self.db_core_iface.createProfile(profile)
|
||||
|
||||
def delContact(self, entity, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.delContact(entity, profile_key)
|
||||
return self.db_core_iface.delContact(entity, profile_key)
|
||||
|
||||
def deleteProfile(self, profile):
|
||||
return self.db_req_iface.deleteProfile(profile)
|
||||
return self.db_core_iface.deleteProfile(profile)
|
||||
|
||||
def disconnect(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.disconnect(profile_key)
|
||||
return self.db_core_iface.disconnect(profile_key)
|
||||
|
||||
def getConfig(self, section, name):
|
||||
return unicode(self.db_comm_iface.getConfig(section, name))
|
||||
return unicode(self.db_core_iface.getConfig(section, name))
|
||||
|
||||
def getContacts(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.getContacts(profile_key)
|
||||
return self.db_core_iface.getContacts(profile_key)
|
||||
|
||||
def getHistory(self, from_jid, to_jid, size):
|
||||
return self.db_comm_iface.getHistory(from_jid, to_jid, size)
|
||||
return self.db_core_iface.getHistory(from_jid, to_jid, size)
|
||||
|
||||
def getMenuHelp(self, category, name, menu_type):
|
||||
return unicode(self.db_req_iface.getMenuHelp(category, name, menu_type))
|
||||
return unicode(self.db_core_iface.getMenuHelp(category, name, menu_type))
|
||||
|
||||
def getMenus(self, ):
|
||||
return self.db_req_iface.getMenus()
|
||||
return self.db_core_iface.getMenus()
|
||||
|
||||
def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_comm_iface.getParamA(name, category, attribute, profile_key))
|
||||
return unicode(self.db_core_iface.getParamA(name, category, attribute, profile_key))
|
||||
|
||||
def getParams(self, profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_comm_iface.getParams(profile_key))
|
||||
return unicode(self.db_core_iface.getParams(profile_key))
|
||||
|
||||
def getParamsCategories(self, ):
|
||||
return self.db_comm_iface.getParamsCategories()
|
||||
return self.db_core_iface.getParamsCategories()
|
||||
|
||||
def getParamsForCategory(self, category, profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_comm_iface.getParamsForCategory(category, profile_key))
|
||||
return unicode(self.db_core_iface.getParamsForCategory(category, profile_key))
|
||||
|
||||
def getParamsUI(self, profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_comm_iface.getParamsUI(profile_key))
|
||||
return unicode(self.db_core_iface.getParamsUI(profile_key))
|
||||
|
||||
def getPresenceStatus(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.getPresenceStatus(profile_key)
|
||||
return self.db_core_iface.getPresenceStatus(profile_key)
|
||||
|
||||
def getProfileName(self, profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_req_iface.getProfileName(profile_key))
|
||||
return unicode(self.db_core_iface.getProfileName(profile_key))
|
||||
|
||||
def getProfilesList(self, ):
|
||||
return self.db_req_iface.getProfilesList()
|
||||
return self.db_core_iface.getProfilesList()
|
||||
|
||||
def getProgress(self, id):
|
||||
return self.db_req_iface.getProgress(id)
|
||||
return self.db_core_iface.getProgress(id)
|
||||
|
||||
def getVersion(self, ):
|
||||
return unicode(self.db_req_iface.getVersion())
|
||||
return unicode(self.db_core_iface.getVersion())
|
||||
|
||||
def getWaitingSub(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.getWaitingSub(profile_key)
|
||||
return self.db_core_iface.getWaitingSub(profile_key)
|
||||
|
||||
def isConnected(self, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.isConnected(profile_key)
|
||||
return self.db_core_iface.isConnected(profile_key)
|
||||
|
||||
def launchAction(self, action_type, data, profile_key="@DEFAULT@"):
|
||||
return unicode(self.db_req_iface.launchAction(action_type, data, profile_key))
|
||||
return unicode(self.db_core_iface.launchAction(action_type, data, profile_key))
|
||||
|
||||
def registerNewAccount(self, login, password, email, host, port=5222):
|
||||
return unicode(self.db_comm_iface.registerNewAccount(login, password, email, host, port))
|
||||
return unicode(self.db_core_iface.registerNewAccount(login, password, email, host, port))
|
||||
|
||||
def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.sendMessage(to_jid, message, subject, mess_type, profile_key)
|
||||
return self.db_core_iface.sendMessage(to_jid, message, subject, mess_type, profile_key)
|
||||
|
||||
def setParam(self, name, value, category, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.setParam(name, value, category, profile_key)
|
||||
return self.db_core_iface.setParam(name, value, category, profile_key)
|
||||
|
||||
def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.setPresence(to_jid, show, priority, statuses, profile_key)
|
||||
return self.db_core_iface.setPresence(to_jid, show, priority, statuses, profile_key)
|
||||
|
||||
def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.subscription(sub_type, entity, profile_key)
|
||||
return self.db_core_iface.subscription(sub_type, entity, profile_key)
|
||||
|
||||
def updateContact(self, entity, name, groups, profile_key="@DEFAULT@"):
|
||||
return self.db_comm_iface.updateContact(entity, name, groups, profile_key)
|
||||
return self.db_core_iface.updateContact(entity, name, groups, profile_key)
|
||||
|
||||
|
||||
#methods from plugins
|
||||
def getRoomJoined(self, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.getRoomJoined(profile_key)
|
||||
return self.db_plugin_iface.getRoomJoined(profile_key)
|
||||
|
||||
def getRoomSubjects(self, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.getRoomSubjects(profile_key)
|
||||
return self.db_plugin_iface.getRoomSubjects(profile_key)
|
||||
|
||||
def joinMUC(self, service, roomId, nick, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.joinMUC(service, roomId, nick, profile_key)
|
||||
return self.db_plugin_iface.joinMUC(service, roomId, nick, profile_key)
|
||||
|
||||
def tarotGameLaunch(self, players, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.tarotGameLaunch(players, profile_key)
|
||||
return self.db_plugin_iface.tarotGameLaunch(players, profile_key)
|
||||
|
||||
def tarotGameCreate(self, room_jid, players, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.tarotGameCreate(room_jid, players, profile_key)
|
||||
return self.db_plugin_iface.tarotGameCreate(room_jid, players, profile_key)
|
||||
|
||||
def tarotGameReady(self, player, referee, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.tarotGameReady(player, referee, profile_key)
|
||||
return self.db_plugin_iface.tarotGameReady(player, referee, profile_key)
|
||||
|
||||
def tarotGameContratChoosed(self, player, referee, contrat, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.tarotGameContratChoosed(player, referee, contrat, profile_key)
|
||||
return self.db_plugin_iface.tarotGameContratChoosed(player, referee, contrat, profile_key)
|
||||
|
||||
def tarotGamePlayCards(self, player, referee, cards, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.tarotGamePlayCards(player, referee, cards, profile_key)
|
||||
return self.db_plugin_iface.tarotGamePlayCards(player, referee, cards, profile_key)
|
||||
|
||||
def quizGameLaunch(self, players, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.quizGameLaunch(players, profile_key)
|
||||
return self.db_plugin_iface.quizGameLaunch(players, profile_key)
|
||||
|
||||
def quizGameCreate(self, room_jid, players, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.quizGameCreate(room_jid, players, profile_key)
|
||||
return self.db_plugin_iface.quizGameCreate(room_jid, players, profile_key)
|
||||
|
||||
def quizGameReady(self, player, referee, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.quizGameReady(player, referee, profile_key)
|
||||
return self.db_plugin_iface.quizGameReady(player, referee, profile_key)
|
||||
|
||||
def quizGameAnswer(self, player, referee, answer, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.quizGameAnswer(player, referee, answer, profile_key)
|
||||
return self.db_plugin_iface.quizGameAnswer(player, referee, answer, profile_key)
|
||||
|
||||
def sendFile(self, to, path, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.sendFile(to, path, profile_key)
|
||||
return self.db_plugin_iface.sendFile(to, path, profile_key)
|
||||
|
||||
def findGateways(self, target, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.findGateways(target, profile_key)
|
||||
return self.db_plugin_iface.findGateways(target, profile_key)
|
||||
|
||||
def getCard(self, target, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.getCard(target, profile_key)
|
||||
return self.db_plugin_iface.getCard(target, profile_key)
|
||||
|
||||
def getCardCache(self, target):
|
||||
return self.db_comm_iface.getCardCache(target)
|
||||
return self.db_plugin_iface.getCardCache(target)
|
||||
|
||||
def getAvatarFile(self, hash):
|
||||
return self.db_comm_iface.getAvatarFile(hash)
|
||||
return self.db_plugin_iface.getAvatarFile(hash)
|
||||
|
||||
def in_band_register(self, target, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.in_band_register(target, profile_key)
|
||||
return self.db_plugin_iface.in_band_register(target, profile_key)
|
||||
|
||||
def gatewayRegister(self, action, target, data, profile_key='@DEFAULT@'):
|
||||
if data == None:
|
||||
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)
|
||||
return self.db_plugin_iface.gatewayRegister(action, target, data, profile_key)
|
||||
|
||||
def getLastMicroblogs(self, jid, max_items, profile_key='@DEFAULT@', callback=None, errback=None):
|
||||
return self.db_comm_iface.getLastMicroblogs(jid, max_items, profile_key, reply_handler=callback, error_handler=errback)
|
||||
return self.db_plugin_iface.getLastMicroblogs(jid, max_items, profile_key, reply_handler=callback, error_handler=errback)
|
||||
|
||||
def getMblogNodes(self, profile_key='@DEFAULT@', callback=None, errback=None):
|
||||
return self.db_comm_iface.getMblogNodes(profile_key, reply_handler=callback, error_handler=errback)
|
||||
return self.db_plugin_iface.getMblogNodes(profile_key, reply_handler=callback, error_handler=errback)
|
||||
|
||||
def sendGroupBlog(self, groups, message, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.sendGroupBlog(groups, message, profile_key)
|
||||
return self.db_plugin_iface.sendGroupBlog(groups, message, profile_key)
|
||||
|
||||
def sendPersonalEvent(self, event_type, data, profile_key='@DEFAULT@'):
|
||||
return self.db_comm_iface.sendPersonalEvent(event_type, data, profile_key)
|
||||
return self.db_plugin_iface.sendPersonalEvent(event_type, data, profile_key)
|
||||
|
||||
def setMicroblogAccess(self, access="presence", profile_key='@DEFAULT@', callback=None, errback=None):
|
||||
return self.db_comm_iface.setMicroblogAccess(access, profile_key, reply_handler=callback, error_handler=errback)
|
||||
return self.db_plugin_iface.setMicroblogAccess(access, profile_key, reply_handler=callback, error_handler=errback)
|
||||
|
|
|
|||
|
|
@ -51,33 +51,33 @@ class QuickApp():
|
|||
self.bridge.register("newMessage", self.newMessage)
|
||||
self.bridge.register("newAlert", self.newAlert)
|
||||
self.bridge.register("presenceUpdate", self.presenceUpdate)
|
||||
self.bridge.register("roomJoined", self.roomJoined)
|
||||
self.bridge.register("roomUserJoined", self.roomUserJoined)
|
||||
self.bridge.register("roomUserLeft", self.roomUserLeft)
|
||||
self.bridge.register("roomNewSubject", self.roomNewSubject)
|
||||
self.bridge.register("tarotGameStarted", self.tarotGameStarted)
|
||||
self.bridge.register("tarotGameNew", self.tarotGameNew)
|
||||
self.bridge.register("tarotGameChooseContrat", self.tarotChooseContrat)
|
||||
self.bridge.register("tarotGameShowCards", self.tarotShowCards)
|
||||
self.bridge.register("tarotGameYourTurn", self.tarotMyTurn)
|
||||
self.bridge.register("tarotGameScore", self.tarotScore)
|
||||
self.bridge.register("tarotGameCardsPlayed", self.tarotCardsPlayed)
|
||||
self.bridge.register("tarotGameInvalidCards", self.tarotInvalidCards)
|
||||
self.bridge.register("quizGameStarted", self.quizGameStarted)
|
||||
self.bridge.register("quizGameNew", self.quizGameNew)
|
||||
self.bridge.register("quizGameQuestion", self.quizGameQuestion)
|
||||
self.bridge.register("quizGamePlayerBuzzed", self.quizGamePlayerBuzzed)
|
||||
self.bridge.register("quizGamePlayerSays", self.quizGamePlayerSays)
|
||||
self.bridge.register("quizGameAnswerResult", self.quizGameAnswerResult)
|
||||
self.bridge.register("quizGameTimerExpired", self.quizGameTimerExpired)
|
||||
self.bridge.register("quizGameTimerRestarted", self.quizGameTimerRestarted)
|
||||
self.bridge.register("subscribe", self.subscribe)
|
||||
self.bridge.register("paramUpdate", self.paramUpdate)
|
||||
self.bridge.register("contactDeleted", self.contactDeleted)
|
||||
self.bridge.register("updatedValue", self.updatedValue, "request")
|
||||
self.bridge.register("askConfirmation", self.askConfirmation, "request")
|
||||
self.bridge.register("actionResult", self.actionResult, "request")
|
||||
self.bridge.register("actionResultExt", self.actionResult, "request")
|
||||
self.bridge.register("updatedValue", self.updatedValue)
|
||||
self.bridge.register("askConfirmation", self.askConfirmation)
|
||||
self.bridge.register("actionResult", self.actionResult)
|
||||
self.bridge.register("actionResultExt", self.actionResult)
|
||||
self.bridge.register("roomJoined", self.roomJoined, "plugin")
|
||||
self.bridge.register("roomUserJoined", self.roomUserJoined, "plugin")
|
||||
self.bridge.register("roomUserLeft", self.roomUserLeft, "plugin")
|
||||
self.bridge.register("roomNewSubject", self.roomNewSubject, "plugin")
|
||||
self.bridge.register("tarotGameStarted", self.tarotGameStarted, "plugin")
|
||||
self.bridge.register("tarotGameNew", self.tarotGameNew, "plugin")
|
||||
self.bridge.register("tarotGameChooseContrat", self.tarotChooseContrat, "plugin")
|
||||
self.bridge.register("tarotGameShowCards", self.tarotShowCards, "plugin")
|
||||
self.bridge.register("tarotGameYourTurn", self.tarotMyTurn, "plugin")
|
||||
self.bridge.register("tarotGameScore", self.tarotScore, "plugin")
|
||||
self.bridge.register("tarotGameCardsPlayed", self.tarotCardsPlayed, "plugin")
|
||||
self.bridge.register("tarotGameInvalidCards", self.tarotInvalidCards, "plugin")
|
||||
self.bridge.register("quizGameStarted", self.quizGameStarted, "plugin")
|
||||
self.bridge.register("quizGameNew", self.quizGameNew, "plugin")
|
||||
self.bridge.register("quizGameQuestion", self.quizGameQuestion, "plugin")
|
||||
self.bridge.register("quizGamePlayerBuzzed", self.quizGamePlayerBuzzed, "plugin")
|
||||
self.bridge.register("quizGamePlayerSays", self.quizGamePlayerSays, "plugin")
|
||||
self.bridge.register("quizGameAnswerResult", self.quizGameAnswerResult, "plugin")
|
||||
self.bridge.register("quizGameTimerExpired", self.quizGameTimerExpired, "plugin")
|
||||
self.bridge.register("quizGameTimerRestarted", self.quizGameTimerRestarted, "plugin")
|
||||
|
||||
self.current_action_ids = set()
|
||||
self.current_action_ids_cb = {}
|
||||
|
|
@ -488,7 +488,9 @@ class QuickApp():
|
|||
except KeyError:
|
||||
pass
|
||||
|
||||
def updatedValue(self, name, data):
|
||||
def updatedValue(self, name, data, profile):
|
||||
if not self.check_profile(profile):
|
||||
return
|
||||
if name == "card_nick":
|
||||
target = JID(data['jid'])
|
||||
if target in self.contactList:
|
||||
|
|
|
|||
Loading…
Reference in a new issue