X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=2c2b8e234524c4902be1f7fa43c35026cdfc3614;hp=95638992589e01fa4a8189ecb8f8e4999c83846b;hb=acafb5b1bf5449a0886f74a81542e920fa1d30f2;hpb=c1299d00ddbb17aa0bf8826f9f6e98d0a756c16f diff --git a/src/connection.py b/src/connection.py index 9563899..2c2b8e2 100644 --- a/src/connection.py +++ b/src/connection.py @@ -4,26 +4,33 @@ import logging import telepathy import constants -import gv_backend +import gtk_toolbox +import gvoice import handle import channel_manager +_moduleLogger = logging.getLogger("connection") + + class TheOneRingConnection(telepathy.server.Connection): - MANDATORY_PARAMETERS = { - 'account' : 's', - 'password' : '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, @@ -34,21 +41,20 @@ 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') self._channelManager = channel_manager.ChannelManager(self) cookieFilePath = "%s/cookies.txt" % constants._data_path_ - self._backend = gv_backend.GVDialer(cookieFilePath) - - self.set_self_handle(handle.create_handle(self, 'self')) + self._session = gvoice.session.Session(cookieFilePath) - self.__disconnect_reason = telepathy.CONNECTION_STATUS_REASON_NONE_SPECIFIED + self.set_self_handle(handle.create_handle(self, 'connection')) - logging.info("Connection to the account %s created" % account) + _moduleLogger.info("Connection to the account %s created" % account) except Exception, e: - logging.exception("Failed to create Connection") + _moduleLogger.exception("Failed to create Connection") raise @property @@ -56,95 +62,138 @@ class TheOneRingConnection(telepathy.server.Connection): return self._manager @property - def gvoice_backend(self): - return self._backend + def session(self): + return self._session @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): """ - org.freedesktop.telepathy.Connection + For org.freedesktop.telepathy.Connection """ - logging.info("Connecting") - self.__disconnect_reason = telepathy.CONNECTION_STATUS_REASON_NONE_SPECIFIED + _moduleLogger.info("Connecting...") + self.StatusChanged( + telepathy.CONNECTION_STATUS_CONNECTING, + telepathy.CONNECTION_STATUS_REASON_REQUESTED + ) try: - self._backend.login(*self._credentials) - except RuntimeError: - self.__disconnect_reason = telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED + self.session.login(*self._credentials) + self.session.backend.set_callback_number(self._callbackNumber) + except gvoice.backend.NetworkError, e: + _moduleLogger.exception("Connection Failed") + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR + ) + 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): """ - org.freedesktop.telepathy.Connection + For org.freedesktop.telepathy.Connection + @bug Not properly logging out. Cookie files need to be per connection and removed """ - logging.info("Disconnecting") - self.__disconnect_reason = telepathy.CONNECTION_STATUS_REASON_REQUESTED - self._backend.logout() - + _moduleLogger.info("Disconnecting") + try: + self.session.logout() + _moduleLogger.info("Disconnected") + except Exception: + _moduleLogger.exception("Disconnecting Failed") + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + telepathy.CONNECTION_STATUS_REASON_REQUESTED + ) + + @gtk_toolbox.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): """ - org.freedesktop.telepathy.Connection + For org.freedesktop.telepathy.Connection + @param type DBus interface name for base channel type @param handleId represents a contact, list, etc according to handleType @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") - contact = handle.contact - 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: + _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): """ - org.freedesktop.telepathy.Connection + For org.freedesktop.telepathy.Connection + Overiding telepathy.server.Connecton to allow custom handles """ self.check_connected() - self.check_handleType(handleType) + self.check_handle_type(handleType) handles = [] 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) - elif handleType == telepathy.HANDLE_TYPE_GROUP: - h = handle.create_handle(self, 'group', 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, requestedContactName = handle.field_split(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._backend.get_contacts() - contactsFound = [ - (contactId, contactName) for (contactId, contactName) in contacts - if contactName == name - ] + def _on_invite_text(self, contactId): + """ + @todo Make this work + """ + h = self._create_contact_handle(contactId) - if 0 < len(contactsFound): - contactId, contactName = contactsFound[0] - h = handle.create_handle(self, 'contact', contactId, contactName) - else: - h = handle.create_handle(self, 'contact', requestedContactId, requestedContactName) + channelManager = self._channelManager + channel = channelManager.channel_for_text(handle)