X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fsimple_presence.py;h=bda9fedce112fdfd2a86b6175083d20ae189a398;hp=44e5c50bac66c50609d6102c6ce021882717c58b;hb=32c3e3b54f59817a16c583ec406a652108f56ef3;hpb=51beca2c54c6a5a5e8dd92f5df0d81fd67406a97

diff --git a/src/simple_presence.py b/src/simple_presence.py
index 44e5c50..bda9fed 100644
--- a/src/simple_presence.py
+++ b/src/simple_presence.py
@@ -2,55 +2,119 @@ import logging
 
 import telepathy
 
+import util.misc as misc_utils
+import tp
+import handle
+import gvoice.state_machine as state_machine
+
+
+_moduleLogger = logging.getLogger(__name__)
+
 
 class TheOneRingPresence(object):
+
+	# Note: these strings are also in the theonering.profile file
 	ONLINE = 'available'
-	BUSY = 'dnd'
+	AWAY = 'away'
+	HIDDEN = 'hidden'
+	OFFLINE = 'offline'
 
 	TO_PRESENCE_TYPE = {
 		ONLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE,
-		BUSY: telepathy.constants.CONNECTION_PRESENCE_TYPE_BUSY,
+		AWAY: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY,
+		HIDDEN: telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN,
+		OFFLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE,
 	}
 
+	@property
+	def session(self):
+		"""
+		@abstract
+		"""
+		raise NotImplementedError()
 
-class ButterflySimplePresence(telepathy.server.ConnectionInterfaceSimplePresence):
-
-	def __init__(self):
-		telepathy.server.ConnectionInterfaceSimplePresence.__init__(self)
-
-		dbus_interface = 'org.freedesktop.Telepathy.Connection.Interface.SimplePresence'
-
-		self._implement_property_get(dbus_interface, {'Statuses' : self._get_statuses})
+	def Disconnect(self):
+		"""
+		@abstract
+		"""
+		raise NotImplementedError("Abstract function called")
 
-	def GetPresences(self, contacts):
+	def get_handle_by_id(self, handleType, handleId):
+		"""
+		@abstract
 		"""
-		@todo Figure out how to know when its self and get whether busy or not
+		raise NotImplementedError("Abstract function called")
 
+	def get_presences(self, contactIds):
+		"""
 		@return {ContactHandle: (Status, Presence Type, Message)}
 		"""
 		presences = {}
-		for handleId in contacts:
-			handle = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId)
+		for handleId in contactIds:
+			h = self.get_handle_by_id(telepathy.HANDLE_TYPE_CONTACT, handleId)
+			if isinstance(h, handle.ConnectionHandle):
+				isDnd = self.session.is_dnd()
+				if isDnd:
+					presence = TheOneRingPresence.HIDDEN
+				else:
+					state = self.session.stateMachine.state
+					if state == state_machine.StateMachine.STATE_ACTIVE:
+						presence = TheOneRingPresence.ONLINE
+					elif state == state_machine.StateMachine.STATE_IDLE:
+						presence = TheOneRingPresence.AWAY
+					else:
+						raise telepathy.errors.InvalidArgument("Unsupported state on the state machine: %s" % state)
+				presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
+			else:
+				presence = TheOneRingPresence.AWAY
+				presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
+
+			presences[h] = (presenceType, presence)
+		return presences
+
+	def set_presence(self, status):
+		if status == self.ONLINE:
+			self.session.set_dnd(False)
+			self.session.stateMachine.set_state(state_machine.StateMachine.STATE_ACTIVE)
+		elif status == self.AWAY:
+			self.session.stateMachine.set_state(state_machine.StateMachine.STATE_IDLE)
+		elif status == self.HIDDEN:
+			self.session.set_dnd(True)
+		elif status == self.OFFLINE:
+			self.Disconnect()
+		else:
+			raise telepathy.errors.InvalidArgument("Unsupported status: %r" % status)
+		_moduleLogger.info("Setting Presence to '%s'" % status)
 
-			presence = TheOneRingPresence.BUSY
-			personalMessage = u""
-			presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
 
-			presences[handle] = (presenceType, presence, personalMessage)
-		return presences
+class SimplePresenceMixin(tp.ConnectionInterfaceSimplePresence, TheOneRingPresence):
 
+	def __init__(self):
+		tp.ConnectionInterfaceSimplePresence.__init__(self)
+		TheOneRingPresence.__init__(self)
+
+		self._implement_property_get(
+			tp.CONNECTION_INTERFACE_SIMPLE_PRESENCE,
+			{'Statuses' : self._get_statuses}
+		)
+
+	@misc_utils.log_exception(_moduleLogger)
+	def GetPresences(self, contacts):
+		"""
+		@return {ContactHandle: (Status, Presence Type, Message)}
+		"""
+		personalMessage = u""
+		return dict(
+			(h, (presenceType, presence, personalMessage))
+			for (h, (presenceType, presence)) in self.get_presences(contacts).iteritems()
+		)
+
+	@misc_utils.log_exception(_moduleLogger)
 	def SetPresence(self, status, message):
 		if message:
-			raise telepathy.errors.InvalidArgument
-
-		if status == TheOneRingPresence.ONLINE:
-			self._conn.mark_dnd(True)
-		elif status == TheOneRingPresence.BUSY:
-			self._conn.mark_dnd(False)
-		else:
-			raise telepathy.errors.InvalidArgument
-		logging.info("Setting Presence to '%s'" % status)
+			raise telepathy.errors.InvalidArgument("Messages aren't supported")
 
+		self.set_presence(status)
 
 	def _get_statuses(self):
 		"""
@@ -58,14 +122,7 @@ class ButterflySimplePresence(telepathy.server.ConnectionInterfaceSimplePresence
 
 		@returns {Name: (Telepathy Type, May Set On Self, Can Have Message)}
 		"""
-		return {
-			TheOneRingPresence.ONLINE: (
-				telepathy.CONNECTION_PRESENCE_TYPE_AVAILABLE,
-				True, False
-			),
-			TheOneRingPresence.BUSY: (
-				telepathy.CONNECTION_PRESENCE_TYPE_AWAY,
-				True, False
-			),
-		}
-
+		return dict(
+			(localType, (telepathyType, True, False))
+			for (localType, telepathyType) in self.TO_PRESENCE_TYPE.iteritems()
+		)