X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fchannel%2Ftext.py;h=5212cd74d7e260ee1410d3f5ad4b54c32d0bb98d;hp=6a6e60a5e589ca37f956e711107721096032b4f5;hb=17ed78514215ad8e1358e329fb2e77ad749fe777;hpb=6ef9231c94a33ecc288d5927d0c8e22917be7f0f diff --git a/src/channel/text.py b/src/channel/text.py index 6a6e60a..5212cd7 100644 --- a/src/channel/text.py +++ b/src/channel/text.py @@ -6,16 +6,17 @@ import telepathy 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("channel.text") +_moduleLogger = logging.getLogger(__name__) class TextChannel(tp.ChannelTypeText): - """ - Look into implementing ChannelInterfaceMessages for rich text formatting - """ + + OLDEST_MESSAGE_WINDOW = datetime.timedelta(days=1) def __init__(self, connection, manager, props, contactHandle): self.__manager = manager @@ -23,7 +24,6 @@ class TextChannel(tp.ChannelTypeText): tp.ChannelTypeText.__init__(self, connection, manager, props) self.__nextRecievedId = 0 - self.__lastMessageTimestamp = datetime.datetime(1, 1, 1) self.__otherHandle = contactHandle @@ -54,22 +54,41 @@ class TextChannel(tp.ChannelTypeText): 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) _moduleLogger.info("Sending message to %r" % (self.__otherHandle, )) - self._conn.session.backend.send_sms(self.__otherHandle.phoneNumber, text) + 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): self.close() def close(self): + _moduleLogger.debug("Closing text") self._conn.session.voicemails.updateSignalHandler.unregister_sink( self.__callback ) @@ -86,7 +105,7 @@ class TextChannel(tp.ChannelTypeText): contactKey = self.__otherHandle.phoneNumber return contactKey - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def _on_conversations_updated(self, conv, conversationIds): if self._contactKey not in conversationIds: return @@ -95,61 +114,68 @@ class TextChannel(tp.ChannelTypeText): self._report_conversation(mergedConversations) def _report_conversation(self, mergedConversations): + newConversations = mergedConversations.conversations + 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 - newConversations = mergedConversations.conversations + postUpdateLen = len(newConversations) + newConversations = gvoice.conversations.filter_out_self(newConversations) + newConversations = list(newConversations) + postSelfLen = len(newConversations) + if postSelfLen < postUpdateLen: + _moduleLogger.info("Dropped %s messages due to being from self" % (postUpdateLen - postSelfLen)) if not newConversations: _moduleLogger.debug( - "No messages ended up existing for %r" % (self._contactKey, ) + "New messages for %r are from yourself" % (self._contactKey, ) ) return - newConversations = self._filter_out_reported(newConversations) - newConversations = self._filter_out_read(newConversations) + + newConversations = gvoice.conversations.filter_out_read(newConversations) newConversations = list(newConversations) + postReadLen = len(newConversations) + if postReadLen < postSelfLen: + _moduleLogger.info("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: + if not messages: _moduleLogger.debug( - "All incoming messages were really outbound messages for %r" % (self._contactKey, ) + "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): + def _report_new_message(self, message, convTime): currentReceivedId = self.__nextRecievedId - timestamp = int(time.time()) + timestamp = time.mktime(convTime.timetuple()) type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL _moduleLogger.info("Received message from User %r" % self.__otherHandle)