X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fchannel%2Ftext.py;h=b1a7aa9c206d002c18e2a67d9507d22787beddfc;hb=54fb3d0f7f39e6446e1771cc29483a4d6138f8dd;hp=050b6a8a534c7848857808dcc6e72ddce9f57d82;hpb=cd56d4ab7a3beaa59e8ef4a5d6c2624419038fee;p=theonering diff --git a/src/channel/text.py b/src/channel/text.py index 050b6a8..b1a7aa9 100644 --- a/src/channel/text.py +++ b/src/channel/text.py @@ -4,7 +4,7 @@ import logging import telepathy -import util.go_utils as gobject_utils +import tp import util.coroutines as coroutines import gtk_toolbox @@ -12,97 +12,147 @@ import gtk_toolbox _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._lastMessageTimestamp = datetime.datetime(1, 1, 1) + def __init__(self, connection, manager, props, contactHandle): + self.__manager = manager + self.__props = props - self._otherHandle = h + tp.ChannelTypeText.__init__(self, connection, manager, props) + self.__nextRecievedId = 0 + self.__lastMessageTimestamp = datetime.datetime(1, 1, 1) - self._callback = coroutines.func_sink( + self.__otherHandle = contactHandle + + self.__callback = coroutines.func_sink( coroutines.expand_positional( self._on_conversations_updated ) ) - self._conn.session.conversations.updateSignalHandler.register_sink( - self._callback + 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: - conversation = self._conn.session.conversations.get_conversation(self._contactKey) + 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: - pass + _moduleLogger.debug("No texts conversation yet for %r" % (self._contactKey, )) else: - self._report_conversation(conversation) + self._report_conversation(mergedConversations) @gtk_toolbox.log_exception(_moduleLogger) def Send(self, messageType, text): if messageType != telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL: 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): - try: - # Clear since the user has seen it all and it should start a new conversation - self._conn.session.conversations.clear_conversation(self._contactKey) + self.close() - self._conn.session.conversations.updateSignalHandler.unregister_sink( - self._callback - ) - finally: - telepathy.server.ChannelTypeText.Close(self) - self.remove_from_connection() + def close(self): + 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() @property def _contactKey(self): - contactKey = self._otherHandle.contactID, self._otherHandle.phoneNumber + contactKey = self.__otherHandle.contactID, self.__otherHandle.phoneNumber return contactKey - @gobject_utils.async @gtk_toolbox.log_exception(_moduleLogger) def _on_conversations_updated(self, conv, conversationIds): if self._contactKey not in conversationIds: return - _moduleLogger.info("Incoming messages from %r for existing conversation" % (self._contactKey, )) - conversation = self._conn.session.conversations.get_conversation(self._contactKey) - self._report_conversation(conversation) - - def _report_conversation(self, conversation): - # @bug? Check if messages sent need to be filtered out - completeMessageHistory = conversation["messageParts"] - messages = self._filter_seen_messages(completeMessageHistory) - self._lastMessageTimestamp = messages[-1][0] - formattedMessage = self._format_messages(messages) - self._report_new_message(formattedMessage) - - def _filter_seen_messages(self, messages): - return [ - message - for message in messages - if self._lastMessageTimestamp < message[0] + _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 - def _format_messages(self, messages): - return "\n".join(message[1] for message in messages) + for newMessage in messages: + formattedMessage = self._format_message(newMessage) + self._report_new_message(formattedMessage) - def _report_new_message(self, message): - currentReceivedId = self._nextRecievedId + 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()) type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL - _moduleLogger.info("Received message from User %r" % self._otherHandle) - self.Received(currentReceivedId, timestamp, self._otherHandle, 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