Improving state machine timing, logged material, comments, etc

[theonering] / src / channel / text.py

diff --git a/src/channel/text.py b/src/channel/text.py
index 5f06973..bcdacbe 100644 (file)
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -4,7 +4,6 @@ import logging
 
 import telepathy
 
-import util.go_utils as gobject_utils
 import util.coroutines as coroutines
 import gtk_toolbox
 
@@ -18,30 +17,45 @@ class TextChannel(telepathy.server.ChannelTypeText):
        """
 
        def __init__(self, connection, manager, props, contactHandle):
-               self._manager = manager
-               self._props = props
+               self.__manager = manager
+               self.__props = props
 
                try:
                        # HACK Older python-telepathy way
                        telepathy.server.ChannelTypeText.__init__(self, connection, contactHandle)
+                       self._requested = props[telepathy.interfaces.CHANNEL_INTERFACE + '.Requested']
+                       self._implement_property_get(
+                               telepathy.interfaces.CHANNEL_INTERFACE,
+                               {"Requested": lambda: self._requested}
+                       )
                except TypeError:
                        # HACK Newer python-telepathy way
                        telepathy.server.ChannelTypeText.__init__(self, connection, manager, props)
-               self._nextRecievedId = 0
-               self._lastMessageTimestamp = datetime.datetime(1, 1, 1)
-
-               self._otherHandle = contactHandle
-
-               self._callback = coroutines.func_sink(
+               self.__nextRecievedId = 0
+               self.__lastMessageTimestamp = datetime.datetime(1, 1, 1)
+
+               self.__otherHandle = contactHandle
+
+               # HACK Older python-telepathy doesn't provide this
+               self._immutable_properties = {
+                       'ChannelType': telepathy.server.interfaces.CHANNEL_INTERFACE,
+                       'TargetHandle': telepathy.server.interfaces.CHANNEL_INTERFACE,
+                       'Interfaces': telepathy.server.interfaces.CHANNEL_INTERFACE,
+                       'TargetHandleType': telepathy.server.interfaces.CHANNEL_INTERFACE,
+                       'TargetID': telepathy.server.interfaces.CHANNEL_INTERFACE,
+                       'Requested': telepathy.server.interfaces.CHANNEL_INTERFACE
+               }
+
+               self.__callback = coroutines.func_sink(
                        coroutines.expand_positional(
                                self._on_conversations_updated
                        )
                )
                self._conn.session.voicemails.updateSignalHandler.register_sink(
-                       self._callback
+                       self.__callback
                )
                self._conn.session.texts.updateSignalHandler.register_sink(
-                       self._callback
+                       self.__callback
                )
 
                # The only reason there should be anything in the conversation is if
@@ -59,12 +73,21 @@ class TextChannel(telepathy.server.ChannelTypeText):
                else:
                        self._report_conversation(mergedConversations)
 
+       def get_props(self):
+               # HACK Older python-telepathy doesn't provide this
+               props = dict()
+               for prop, iface in self._immutable_properties.items():
+                       props[iface + '.' + prop] = \
+                               self._prop_getters[iface][prop]()
+               return props
+
        @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)
@@ -75,22 +98,22 @@ class TextChannel(telepathy.server.ChannelTypeText):
 
        def close(self):
                self._conn.session.voicemails.updateSignalHandler.unregister_sink(
-                       self._callback
+                       self.__callback
                )
                self._conn.session.texts.updateSignalHandler.unregister_sink(
-                       self._callback
+                       self.__callback
                )
-               self._callback = None
+               self.__callback = None
 
                telepathy.server.ChannelTypeText.Close(self)
-               if self._manager.channel_exists(self._props):
+               if self.__manager.channel_exists(self.__props):
                        # HACK Older python-telepathy requires doing this manually
-                       self._manager.remove_channel(self)
+                       self.__manager.remove_channel(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
 
        @gtk_toolbox.log_exception(_moduleLogger)
@@ -102,6 +125,9 @@ class TextChannel(telepathy.server.ChannelTypeText):
                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
                newConversations = self._filter_out_reported(newConversations)
                newConversations = self._filter_out_read(newConversations)
@@ -111,7 +137,7 @@ class TextChannel(telepathy.server.ChannelTypeText):
                                "New messages for %r have already been read externally" % (self._contactKey, )
                        )
                        return
-               self._lastMessageTimestamp = newConversations[-1].time
+               self.__lastMessageTimestamp = newConversations[-1].time
 
                messages = [
                        newMessage
@@ -133,7 +159,7 @@ class TextChannel(telepathy.server.ChannelTypeText):
                return (
                        conversation
                        for conversation in conversations
-                       if self._lastMessageTimestamp < conversation.time
+                       if self.__lastMessageTimestamp < conversation.time
                )
 
        def _filter_out_read(self, conversations):
@@ -147,11 +173,11 @@ class TextChannel(telepathy.server.ChannelTypeText):
                return " ".join(part.text.strip() for part in message.body)
 
        def _report_new_message(self, message):
-               currentReceivedId = self._nextRecievedId
+               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