X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpresence.py;h=c73a06140747c6ee053435fe16dcbaec127d72f4;hb=5bfb4228f1fff939aa06dfbe446cf17b5ce3ed76;hp=8350e712a74558e23337e4f6afeb1dd244ff5afa;hpb=ab4da214c520d763bbbddeb828c8e7c838374fe3;p=theonering

diff --git a/src/presence.py b/src/presence.py
index 8350e71..c73a061 100644
--- a/src/presence.py
+++ b/src/presence.py
@@ -1,95 +1,48 @@
 import logging
 
-import telepathy
-
+import tp
+import util.misc as misc_utils
 import simple_presence
 
 
-class ButterflyPresence(telepathy.server.ConnectionInterfacePresence):
+_moduleLogger = logging.getLogger('presence')
+
+
+class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPresence):
 
 	def __init__(self):
-		telepathy.server.ConnectionInterfacePresence.__init__(self)
+		tp.ConnectionInterfacePresence.__init__(self)
+		simple_presence.TheOneRingPresence.__init__(self)
 
+	@misc_utils.log_exception(_moduleLogger)
 	def GetStatuses(self):
 		# the arguments are in common to all on-line presences
-		arguments = {'message' : 's'}
+		arguments = {}
 
-		# you get one of these for each status
-		# {name:(type, self, exclusive, {argument:types}}
-		return {
-			simple_presence.ButterflyPresenceMapping.ONLINE:(
-				telepathy.CONNECTION_PRESENCE_TYPE_AVAILABLE,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.AWAY:(
-				telepathy.CONNECTION_PRESENCE_TYPE_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.BUSY:(
-				telepathy.CONNECTION_PRESENCE_TYPE_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.IDLE:(
-				telepathy.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.BRB:(
-				telepathy.CONNECTION_PRESENCE_TYPE_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.PHONE:(
-				telepathy.CONNECTION_PRESENCE_TYPE_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.LUNCH:(
-				telepathy.CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY,
-				True, True, arguments),
-			simple_presence.ButterflyPresenceMapping.INVISIBLE:(
-				telepathy.CONNECTION_PRESENCE_TYPE_HIDDEN,
-				True, True, {}),
-			simple_presence.ButterflyPresenceMapping.OFFLINE:(
-				telepathy.CONNECTION_PRESENCE_TYPE_OFFLINE,
-				True, True, {})
-		}
+		return dict(
+			(localType, (telepathyType, True, True, arguments))
+			for (localType, telepathyType) in self.TO_PRESENCE_TYPE.iteritems()
+		)
 
-	def RequestPresence(self, contacts):
-		presences = self.get_presences(contacts)
+	@misc_utils.log_exception(_moduleLogger)
+	def RequestPresence(self, contactIds):
+		presences = self.__get_presences(contactIds)
 		self.PresenceUpdate(presences)
 
-	def GetPresence(self, contacts):
-		return self.get_presences(contacts)
+	@misc_utils.log_exception(_moduleLogger)
+	def GetPresence(self, contactIds):
+		return self.__get_presences(contactIds)
 
+	@misc_utils.log_exception(_moduleLogger)
 	def SetStatus(self, statuses):
+		assert len(statuses) == 1
 		status, arguments = statuses.items()[0]
-		if status == simple_presence.ButterflyPresenceMapping.OFFLINE:
-			self.Disconnect()
-
-		presence = simple_presence.ButterflyPresenceMapping.to_pymsn[status]
-		message = arguments.get('message', u'').encode("utf-8")
-
-		logging.info("Setting Presence to '%s'" % presence)
-		logging.info("Setting Personal message to '%s'" % message)
-
-		if self._status != telepathy.CONNECTION_STATUS_CONNECTED:
-			self._initial_presence = presence
-			self._initial_personal_message = message
-		else:
-			self.msn_client.profile.personal_message = message
-			self.msn_client.profile.presence = presence
-
-	def get_presences(self, contacts):
-		presences = {}
-		for handleId in contacts:
-			h = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId)
-			try:
-				contact = h.contact
-			except AttributeError:
-				contact = h.profile
-
-			if contact is not None:
-				presence = simple_presence.ButterflyPresenceMapping.to_telepathy[contact.presence]
-				personal_message = unicode(contact.personal_message, "utf-8")
-			else:
-				presence = simple_presence.ButterflyPresenceMapping.OFFLINE
-				personal_message = u""
-
-			arguments = {}
-			if personal_message:
-				arguments = {'message' : personal_message}
-
-			presences[h] = (0, {presence : arguments}) # TODO: Timestamp
-		return presences
+		assert len(arguments) == 0
+		self.set_presence(status)
+
+	def __get_presences(self, contacts):
+		arguments = {}
+		return dict(
+			(h, (0, {presence: arguments}))
+			for (h, (presenceType, presence)) in self.get_presences(contacts).iteritems()
+		)