Minature bug fixes to help things progress along

[theonering] / src / connection.py

diff --git a/src/connection.py b/src/connection.py
index 591f7b7..2db7df6 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -4,17 +4,27 @@ import logging
 import telepathy
 
 import constants
+import util.go_utils as gobject_utils
+import util.coroutines as coroutines
+import gtk_toolbox
 import gvoice
 import handle
+import aliasing
+import simple_presence
 import channel_manager
 
 
 _moduleLogger = logging.getLogger("connection")
 
 
-class TheOneRingConnection(telepathy.server.Connection):
+class TheOneRingConnection(
+       telepathy.server.Connection,
+       aliasing.AliasingMixin,
+       simple_presence.SimplePresenceMixin,
+):
 
        # Overriding a base class variable
+       # Should the forwarding number be handled by the alias or by an option?
        _mandatory_parameters = {
                'username' : 's',
                'password' : 's',
@@ -27,16 +37,19 @@ class TheOneRingConnection(telepathy.server.Connection):
        }
 
        def __init__(self, manager, parameters):
+               self.check_parameters(parameters)
                try:
-                       self.check_parameters(parameters)
                        account = unicode(parameters['username'])
 
+                       # Connection init must come first
                        telepathy.server.Connection.__init__(
                                self,
                                constants._telepathy_protocol_name_,
                                account,
                                constants._telepathy_implementation_name_
                        )
+                       aliasing.AliasingMixin.__init__(self)
+                       simple_presence.SimplePresenceMixin.__init__(self)
 
                        self._manager = weakref.proxy(manager)
                        self._credentials = (
@@ -72,6 +85,7 @@ class TheOneRingConnection(telepathy.server.Connection):
                self.check_handle(handleType, handleId)
                return self._handles[handleType, handleId]
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def Connect(self):
                """
                For org.freedesktop.telepathy.Connection
@@ -103,6 +117,7 @@ class TheOneRingConnection(telepathy.server.Connection):
                                telepathy.CONNECTION_STATUS_REASON_REQUESTED
                        )
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def Disconnect(self):
                """
                For org.freedesktop.telepathy.Connection
@@ -119,6 +134,7 @@ class TheOneRingConnection(telepathy.server.Connection):
                        telepathy.CONNECTION_STATUS_REASON_REQUESTED
                )
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def RequestChannel(self, type, handleType, handleId, suppressHandler):
                """
                For org.freedesktop.telepathy.Connection
@@ -129,6 +145,7 @@ class TheOneRingConnection(telepathy.server.Connection):
                @returns DBus object path for the channel created or retrieved
                """
                self.check_connected()
+               self.check_handle(handleType, handleId)
 
                channel = None
                channelManager = self._channelManager
@@ -139,19 +156,21 @@ class TheOneRingConnection(telepathy.server.Connection):
                        channel = channelManager.channel_for_list(handle, suppressHandler)
                elif type == telepathy.CHANNEL_TYPE_TEXT:
                        _moduleLogger.info("RequestChannel Text")
-                       channel = channelManager.channel_for_text(handle, None, suppressHandler)
+                       channel = channelManager.channel_for_text(handle, suppressHandler)
                elif type == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
                        _moduleLogger.info("RequestChannel Media")
-                       channel = channelManager.channel_for_text(handle, None, suppressHandler)
+                       channel = channelManager.channel_for_call(handle, suppressHandler)
                else:
-                       raise telepathy.NotImplemented("unknown channel type %s" % type)
+                       raise telepathy.errors.NotImplemented("unknown channel type %s" % type)
 
                _moduleLogger.info("RequestChannel Object Path: %s" % channel._object_path)
                return channel._object_path
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def RequestHandles(self, handleType, names, sender):
                """
                For org.freedesktop.telepathy.Connection
+               Overiding telepathy.server.Connecton to allow custom handles
                """
                self.check_connected()
                self.check_handle_type(handleType)
@@ -167,24 +186,27 @@ class TheOneRingConnection(telepathy.server.Connection):
                                _moduleLogger.info("RequestHandles List: %s" % name)
                                h = handle.create_handle(self, 'list', name)
                        else:
-                               raise telepathy.NotAvailable('Handle type unsupported %d' % handleType)
+                               raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
                        handles.append(h.id)
                        self.add_client_handle(h, sender)
                return handles
 
-       def _create_contact_handle(self, name):
-               requestedContactId = name
-
-               contacts = self.session.addressbook.get_contacts()
-               contactsFound = [
-                       contactId for contactId in contacts
-                       if contactId == requestedContactId
-               ]
-
-               if 0 < len(contactsFound):
-                       contactId = contactsFound[0]
-                       if len(contactsFound) != 1:
-                               _moduleLogger.error("Contact ID was not unique: %s for %s" % (contactId, ))
-               else:
-                       contactId = requestedContactId
-               h = handle.create_handle(self, 'contact', contactId)
+       def _create_contact_handle(self, requestedHandleName):
+               requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
+                       requestedHandleName
+               )
+               h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
+               return h
+
+       @coroutines.func_sink
+       @coroutines.expand_positional
+       @gobject_utils.async
+       def _on_conversations_updated(self, conversationIds):
+               # @todo get conversations update running
+               # @todo test conversatiuons
+               channelManager = self._channelManager
+               for contactId, phoneNumber in conversationIds:
+                       h = self._create_contact_handle(contactId, phoneNumber)
+                       # if its new, __init__ will take care of things
+                       # if its old, its own update will take care of it
+                       channel = channelManager.channel_for_text(handle)