X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fsimple_presence.py;h=bda9fedce112fdfd2a86b6175083d20ae189a398;hp=57df2122d68247dd9387c209b0c6032ff11febc7;hb=1cc0604ffca40bbfaee12c9fb5dc702fe921bb8c;hpb=c2efc93da8af622354dd6eb82e0e3f03873abaf9

diff --git a/src/simple_presence.py b/src/simple_presence.py
index 57df212..bda9fed 100644
--- a/src/simple_presence.py
+++ b/src/simple_presence.py
@@ -2,34 +2,30 @@ import logging
 
 import telepathy
 
-import gtk_toolbox
+import util.misc as misc_utils
+import tp
 import handle
+import gvoice.state_machine as state_machine
 
 
-_moduleLogger = logging.getLogger("simple_presence")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class TheOneRingPresence(object):
+
+	# Note: these strings are also in the theonering.profile file
 	ONLINE = 'available'
-	IDLE = 'idle'
-	BUSY = 'dnd'
+	AWAY = 'away'
+	HIDDEN = 'hidden'
+	OFFLINE = 'offline'
 
 	TO_PRESENCE_TYPE = {
 		ONLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE,
-		IDLE: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY,
-		BUSY: telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN,
+		AWAY: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY,
+		HIDDEN: telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN,
+		OFFLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE,
 	}
 
-
-class SimplePresenceMixin(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})
-
 	@property
 	def session(self):
 		"""
@@ -37,55 +33,89 @@ class SimplePresenceMixin(telepathy.server.ConnectionInterfaceSimplePresence):
 		"""
 		raise NotImplementedError()
 
-	@property
-	def handle(self):
+	def Disconnect(self):
 		"""
 		@abstract
 		"""
-		raise NotImplementedError("Abstract property called")
+		raise NotImplementedError("Abstract function called")
 
-	@gtk_toolbox.log_exception(_moduleLogger)
-	def GetPresences(self, contacts):
+	def get_handle_by_id(self, handleType, handleId):
+		"""
+		@abstract
+		"""
+		raise NotImplementedError("Abstract function called")
+
+	def get_presences(self, contactIds):
 		"""
 		@return {ContactHandle: (Status, Presence Type, Message)}
 		"""
 		presences = {}
-		for handleId in contacts:
-			h = 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.backend.is_dnd()
+				isDnd = self.session.is_dnd()
 				if isDnd:
-					presence = TheOneRingPresence.BUSY
+					presence = TheOneRingPresence.HIDDEN
 				else:
-					# @todo switch this over to also supporting idle
-					presence = TheOneRingPresence.ONLINE
-				personalMessage = u""
+					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.ONLINE
-				personalMessage = u""
+				presence = TheOneRingPresence.AWAY
 				presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
 
-			presences[h] = (presenceType, presence, personalMessage)
+			presences[h] = (presenceType, presence)
 		return presences
 
-	@gtk_toolbox.log_exception(_moduleLogger)
-	def SetPresence(self, status, message):
-		if message:
-			raise telepathy.errors.InvalidArgument("Messages aren't supported")
-
-		if status == TheOneRingPresence.ONLINE:
-			self.gvoice_backend.set_dnd(False)
-		elif status == TheOneRingPresence.IDLE:
-			# @todo Add idle support
-			raise telepathy.errors.InvalidArgument("Not Supported Yet")
-		elif status == TheOneRingPresence.BUSY:
-			self.gvoice_backend.set_dnd(True)
+	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)
 
 
+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("Messages aren't supported")
+
+		self.set_presence(status)
+
 	def _get_statuses(self):
 		"""
 		Property mapping presence statuses available to the corresponding presence types
@@ -94,5 +124,5 @@ class SimplePresenceMixin(telepathy.server.ConnectionInterfaceSimplePresence):
 		"""
 		return dict(
 			(localType, (telepathyType, True, False))
-			for (localType, telepathyType) in TheOneRingPresence.TO_PRESENCE_TYPE.iteritems()
+			for (localType, telepathyType) in self.TO_PRESENCE_TYPE.iteritems()
 		)