X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=2c2b8e234524c4902be1f7fa43c35026cdfc3614;hp=6ff64d8b59928e903a6b677054feaf2fb063c0aa;hb=acafb5b1bf5449a0886f74a81542e920fa1d30f2;hpb=5fa21a13a94f9e43d9b23990c373303cb08b5ca1 diff --git a/src/connection.py b/src/connection.py index 6ff64d8..2c2b8e2 100644 --- a/src/connection.py +++ b/src/connection.py @@ -4,6 +4,7 @@ import logging import telepathy import constants +import gtk_toolbox import gvoice import handle import channel_manager @@ -14,20 +15,22 @@ _moduleLogger = logging.getLogger("connection") class TheOneRingConnection(telepathy.server.Connection): - MANDATORY_PARAMETERS = { - 'account' : 's', + # Overriding a base class variable + _mandatory_parameters = { + 'username' : 's', 'password' : 's', 'forward' : 's', } - OPTIONAL_PARAMETERS = { + # Overriding a base class variable + _optional_parameters = { } - PARAMETER_DEFAULTS = { + _parameter_defaults = { } def __init__(self, manager, parameters): try: self.check_parameters(parameters) - account = unicode(parameters['account']) + account = unicode(parameters['username']) telepathy.server.Connection.__init__( self, @@ -38,7 +41,7 @@ class TheOneRingConnection(telepathy.server.Connection): self._manager = weakref.proxy(manager) self._credentials = ( - parameters['account'].encode('utf-8'), + parameters['username'].encode('utf-8'), parameters['password'].encode('utf-8'), ) self._callbackNumber = parameters['forward'].encode('utf-8') @@ -64,16 +67,18 @@ class TheOneRingConnection(telepathy.server.Connection): @property def username(self): - self._credentials[0] + return self._credentials[0] def handle(self, handleType, handleId): self.check_handle(handleType, handleId) return self._handles[handleType, handleId] + @gtk_toolbox.log_exception(_moduleLogger) def Connect(self): """ For org.freedesktop.telepathy.Connection """ + _moduleLogger.info("Connecting...") self.StatusChanged( telepathy.CONNECTION_STATUS_CONNECTING, telepathy.CONNECTION_STATUS_REASON_REQUESTED @@ -81,26 +86,32 @@ class TheOneRingConnection(telepathy.server.Connection): try: self.session.login(*self._credentials) self.session.backend.set_callback_number(self._callbackNumber) - except gvoice.backend.NetworkError: + except gvoice.backend.NetworkError, e: + _moduleLogger.exception("Connection Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR ) - except Exception: + except Exception, e: + _moduleLogger.exception("Connection Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED ) else: + _moduleLogger.info("Connected") self.StatusChanged( telepathy.CONNECTION_STATUS_CONNECTED, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) + @gtk_toolbox.log_exception(_moduleLogger) def Disconnect(self): """ For org.freedesktop.telepathy.Connection + @bug Not properly logging out. Cookie files need to be per connection and removed """ + _moduleLogger.info("Disconnecting") try: self.session.logout() _moduleLogger.info("Disconnected") @@ -111,6 +122,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 @@ -121,29 +133,32 @@ 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 handle = self.handle(handleType, handleId) if type == telepathy.CHANNEL_TYPE_CONTACT_LIST: + _moduleLogger.info("RequestChannel ContactList") channel = channelManager.channel_for_list(handle, suppressHandler) elif type == telepathy.CHANNEL_TYPE_TEXT: - if handleType != telepathy.HANDLE_TYPE_CONTACT: - raise telepathy.NotImplemented("Only Contacts are allowed") - channel = channelManager.channel_for_text(handle, None, suppressHandler) + _moduleLogger.info("RequestChannel Text") + channel = channelManager.channel_for_text(handle, suppressHandler) elif type == telepathy.CHANNEL_TYPE_STREAMED_MEDIA: - if handleType != telepathy.HANDLE_TYPE_CONTACT: - raise telepathy.NotImplemented("Only Contacts are allowed") - channel = channelManager.channel_for_text(handle, None, suppressHandler) + _moduleLogger.info("RequestChannel Media") + channel = channelManager.channel_for_call(handle, suppressHandler) else: raise telepathy.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) @@ -152,29 +167,33 @@ class TheOneRingConnection(telepathy.server.Connection): for name in names: name = name.encode('utf-8') if handleType == telepathy.HANDLE_TYPE_CONTACT: + _moduleLogger.info("RequestHandles Contact: %s" % name) h = self._create_contact_handle(name) elif handleType == telepathy.HANDLE_TYPE_LIST: # Support only server side (immutable) lists + _moduleLogger.info("RequestHandles List: %s" % name) h = handle.create_handle(self, 'list', name) else: raise telepathy.NotAvailable('Handle type unsupported %d' % handleType) handles.append(h.id) - self.add_client_handle(handle, sender) + self.add_client_handle(h, sender) return handles - def _create_contact_handle(self, name): - requestedContactId = name + def _create_contact_handle(self, requestedHandleName): + """ + @todo Determine if nay of this is really needed + """ + requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name( + requestedHandleName + ) + h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber) + return h - contacts = self.session.addressbook.get_contacts() - contactsFound = [ - contactId for contactId in contacts - if contactId == requestedContactId - ] + def _on_invite_text(self, contactId): + """ + @todo Make this work + """ + h = self._create_contact_handle(contactId) - 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) + channelManager = self._channelManager + channel = channelManager.channel_for_text(handle)