X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchannel%2Ftext.py;h=8b124c9ab441d90a4646c6b409acc03083a2a865;hb=2bcd7b94d276c3f6ff4441e3bf05e7598177f251;hp=3daacf0414320430390cebf6170688fd0deddb6d;hpb=acafb5b1bf5449a0886f74a81542e920fa1d30f2;p=theonering

diff --git a/src/channel/text.py b/src/channel/text.py
index 3daacf0..8b124c9 100644
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -1,55 +1,159 @@
 import time
+import datetime
 import logging
 
 import telepathy
 
+import tp
+import util.coroutines as coroutines
 import gtk_toolbox
-import handle
 
 
 _moduleLogger = logging.getLogger("channel.text")
 
 
-class TextChannel(telepathy.server.ChannelTypeText):
+class TextChannel(tp.ChannelTypeText):
 	"""
 	Look into implementing ChannelInterfaceMessages for rich text formatting
 	"""
 
-	def __init__(self, connection, h):
-		telepathy.server.ChannelTypeText.__init__(self, connection, h)
-		self._nextRecievedId = 0
-
-		self._otherHandle = h
-		handles = [h]
-		#self.MembersChanged('', handles, [], [], [],
-		#		0, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE)
+	def __init__(self, connection, manager, props, contactHandle):
+		self.__manager = manager
+		self.__props = props
+
+		tp.ChannelTypeText.__init__(self, connection, manager, props)
+		self.__nextRecievedId = 0
+		self.__lastMessageTimestamp = datetime.datetime(1, 1, 1)
+
+		self.__otherHandle = contactHandle
+
+		self.__callback = coroutines.func_sink(
+			coroutines.expand_positional(
+				self._on_conversations_updated
+			)
+		)
+		self._conn.session.voicemails.updateSignalHandler.register_sink(
+			self.__callback
+		)
+		self._conn.session.texts.updateSignalHandler.register_sink(
+			self.__callback
+		)
+
+		# The only reason there should be anything in the conversation is if
+		# its new, so report it all
+		try:
+			mergedConversations = self._conn.session.voicemails.get_conversation(self._contactKey)
+		except KeyError:
+			_moduleLogger.debug("No voicemails in the conversation yet for %r" % (self._contactKey, ))
+		else:
+			self._report_conversation(mergedConversations)
+		try:
+			mergedConversations = self._conn.session.texts.get_conversation(self._contactKey)
+		except KeyError:
+			_moduleLogger.debug("No texts conversation yet for %r" % (self._contactKey, ))
+		else:
+			self._report_conversation(mergedConversations)
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def Send(self, messageType, text):
 		if messageType != telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
-			raise telepathy.NotImplemented("Unhandled message type: %r" % messageType)
+			raise telepathy.errors.NotImplemented("Unhandled message type: %r" % messageType)
 
-		self._conn.session.backend.send_sms(self._otherHandle.phoneNumber, text)
+		_moduleLogger.info("Sending message to %r" % (self.__otherHandle, ))
+		self._conn.session.backend.send_sms(self.__otherHandle.phoneNumber, text)
+		self._conn.session.textsStateMachine.reset_timers()
 
 		self.Sent(int(time.time()), messageType, text)
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def Close(self):
-		telepathy.server.ChannelTypeText.Close(self)
+		self.close()
+
+	def close(self):
+		_moduleLogger.info("Closing text")
+		self._conn.session.voicemails.updateSignalHandler.unregister_sink(
+			self.__callback
+		)
+		self._conn.session.texts.updateSignalHandler.unregister_sink(
+			self.__callback
+		)
+		self.__callback = None
+
+		tp.ChannelTypeText.Close(self)
 		self.remove_from_connection()
 
-	def _on_message_received(self, contactId, contactNumber, message):
-		"""
-		@todo Attatch this to receiving a message
-		"""
-		currentReceivedId = self._nextRecievedId
+	@property
+	def _contactKey(self):
+		contactKey = self.__otherHandle.phoneNumber
+		return contactKey
 
+	@gtk_toolbox.log_exception(_moduleLogger)
+	def _on_conversations_updated(self, conv, conversationIds):
+		if self._contactKey not in conversationIds:
+			return
+		_moduleLogger.debug("Incoming messages from %r for existing conversation" % (self._contactKey, ))
+		mergedConversations = conv.get_conversation(self._contactKey)
+		self._report_conversation(mergedConversations)
+
+	def _report_conversation(self, mergedConversations):
+		# Can't filter out messages in a texting conversation that came in
+		# before the last one sent because that creates a race condition of two
+		# people sending at about the same time, which happens quite a bit
+		newConversations = mergedConversations.conversations
+		if not newConversations:
+			_moduleLogger.debug(
+				"No messages ended up existing for %r" % (self._contactKey, )
+			)
+			return
+		newConversations = self._filter_out_reported(newConversations)
+		newConversations = self._filter_out_read(newConversations)
+		newConversations = list(newConversations)
+		if not newConversations:
+			_moduleLogger.debug(
+				"New messages for %r have already been read externally" % (self._contactKey, )
+			)
+			return
+		self.__lastMessageTimestamp = newConversations[-1].time
+
+		messages = [
+			newMessage
+			for newConversation in newConversations
+			for newMessage in newConversation.messages
+			if newMessage.whoFrom != "Me:"
+		]
+		if not newConversations:
+			_moduleLogger.debug(
+				"All incoming messages were really outbound messages for %r" % (self._contactKey, )
+			)
+			return
+
+		for newMessage in messages:
+			formattedMessage = self._format_message(newMessage)
+			self._report_new_message(formattedMessage)
+
+	def _filter_out_reported(self, conversations):
+		return (
+			conversation
+			for conversation in conversations
+			if self.__lastMessageTimestamp < conversation.time
+		)
+
+	def _filter_out_read(self, conversations):
+		return (
+			conversation
+			for conversation in conversations
+			if not conversation.isRead and not conversation.isArchived
+		)
+
+	def _format_message(self, message):
+		return " ".join(part.text.strip() for part in message.body)
+
+	def _report_new_message(self, message):
+		currentReceivedId = self.__nextRecievedId
 		timestamp = int(time.time())
-		h = handle.create_handle(self._conn, "contact", contactId, contactNumber)
 		type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL
-		message = message.content
 
-		_moduleLogger.info("Received message from User %r" % h)
-		self.Received(id, timestamp, h, type, 0, message)
+		_moduleLogger.info("Received message from User %r" % self.__otherHandle)
+		self.Received(currentReceivedId, timestamp, self.__otherHandle, type, 0, message)
 
-		self._nextRecievedId += 1
+		self.__nextRecievedId += 1