X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fchannel%2Ftext.py;h=206299c02adb9f57b504ebd96585e8de64951c8f;hp=37d3f6f6d92cdff6c2884d30dd9be9e6f5c05ff4;hb=da66a4ebd1deb3939a5bcf4abcd0d6d9708b59d8;hpb=b2b59a3eebb396e5663a50ef639b148fd2ac9c99 diff --git a/src/channel/text.py b/src/channel/text.py index 37d3f6f..206299c 100644 --- a/src/channel/text.py +++ b/src/channel/text.py @@ -4,133 +4,181 @@ import logging import telepathy -import util.go_utils as gobject_utils +import tp import util.coroutines as coroutines -import gtk_toolbox +import util.misc as misc_utils +import util.go_utils as gobject_utils +import gvoice + +_moduleLogger = logging.getLogger(__name__) -_moduleLogger = logging.getLogger("channel.text") +class TextChannel(tp.ChannelTypeText): -class TextChannel(telepathy.server.ChannelTypeText): - """ - Look into implementing ChannelInterfaceMessages for rich text formatting - """ + OLDEST_MESSAGE_WINDOW = datetime.timedelta(days=1) - 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._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: - mergedConversations = self._conn.session.conversations.get_conversation(self._contactKey) + mergedConversations = self._conn.session.voicemails.get_conversation(self._contactKey) except KeyError: - pass + _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) + @misc_utils.log_exception(_moduleLogger) def Send(self, messageType, text): + le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._send) + le.start(messageType, text) + + @misc_utils.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) - self._conn.session.stateMachine.reset_timers() + _moduleLogger.info("Sending message to %r" % (self.__otherHandle, )) + try: + result = yield ( + self._conn.session.backend.send_sms, + ([self.__otherHandle.phoneNumber], text), + {}, + ) + except Exception: + _moduleLogger.exception("Oh no, what happened?") + return + + self._conn.session.textsStateMachine.reset_timers() self.Sent(int(time.time()), messageType, text) - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) + def _on_send_sms_failed(self, error): + _moduleLogger.error(error) + + @misc_utils.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): + _moduleLogger.debug("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() @property def _contactKey(self): - contactKey = self._otherHandle.contactID, self._otherHandle.phoneNumber + contactKey = self.__otherHandle.phoneNumber return contactKey - @gobject_utils.async - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.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, )) - mergedConversations = self._conn.session.conversations.get_conversation(self._contactKey) + _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): newConversations = mergedConversations.conversations - newConversations = self._filter_out_reported(newConversations) - newConversations = self._filter_out_read(newConversations) - newConversations = list(newConversations) if not newConversations: _moduleLogger.info( + "No messages ended up existing for %r" % (self._contactKey, ) + ) + return + + # 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 + postUpdateLen = len(newConversations) + newConversations = gvoice.conversations.filter_out_self(newConversations) + newConversations = list(newConversations) + postSelfLen = len(newConversations) + if postSelfLen < postUpdateLen: + self._conn.log_to_user(__name__, "Dropped %s messages due to being from self" % (postUpdateLen - postSelfLen)) + if not newConversations: + _moduleLogger.debug( + "New messages for %r are from yourself" % (self._contactKey, ) + ) + return + + newConversations = gvoice.conversations.filter_out_read(newConversations) + newConversations = list(newConversations) + postReadLen = len(newConversations) + if postReadLen < postSelfLen: + self._conn.log_to_user(__name__, "Dropped %s messages due to already being read" % (postSelfLen- postReadLen)) + if not newConversations: + _moduleLogger.debug( "New messages for %r have already been read externally" % (self._contactKey, ) ) return - self._lastMessageTimestamp = newConversations[-1].time messages = [ - newMessage + (newMessage, newConversation) for newConversation in newConversations for newMessage in newConversation.messages - if newMessage.whoFrom != "Me:" + if not gvoice.conversations.is_message_from_self(newMessage) ] - if not newConversations: - _moduleLogger.info( - "All incoming messages were really outbound messages for %r" % (self._contactKey, ) + if not messages: + _moduleLogger.debug( + "How did this happen for %r?" % (self._contactKey, ) ) return - for newMessage in messages: + now = datetime.datetime.now() + for newMessage, conv in messages: + if self.OLDEST_MESSAGE_WINDOW < (now - conv.time): + _moduleLogger.warning("Why are we reporting a message that is so old?") + _moduleLogger.warning("\t%r %r (%r) with %r messages" % (conv.number, conv.id, conv.time, len(conv.messages))) formattedMessage = self._format_message(newMessage) - self._report_new_message(formattedMessage) + self._report_new_message(formattedMessage, conv.time) - 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 - ) + for conv in mergedConversations.conversations: + conv.isRead = True 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()) + def _report_new_message(self, message, convTime): + currentReceivedId = self.__nextRecievedId + timestamp = time.mktime(convTime.timetuple()) 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