X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=fa87b316ee5e3aa237ace3054efc00073f692358;hp=2fd3632d153acaaadf2160cf8cb0937b8e438c88;hb=bc433598796afa36b5d75b7c40af19abdb573f67;hpb=5a9e15edc57b063b41b40aa9f4143713ccae9bc1 diff --git a/src/connection.py b/src/connection.py index 2fd3632..fa87b31 100644 --- a/src/connection.py +++ b/src/connection.py @@ -4,50 +4,63 @@ 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 channel_manager +import aliasing import simple_presence +import channel_manager _moduleLogger = logging.getLogger("connection") -class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePresenceMixin): +class TheOneRingConnection( + telepathy.server.Connection, + aliasing.AliasingMixin, + simple_presence.SimplePresenceMixin, +): - MANDATORY_PARAMETERS = { - 'account' : 's', + # Overriding a base class variable + # Should the forwarding number be handled by the alias or by an option? + _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): + self.check_parameters(parameters) try: - self.check_parameters(parameters) - account = unicode(parameters['account']) + 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 = ( - 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 = gvoice.dialer.GVDialer(cookieFilePath) - self._addressbook = gvoice.addressbook.Addressbook(self._backend) + cookieFilePath = None + self._session = gvoice.session.Session(cookieFilePath) self.set_self_handle(handle.create_handle(self, 'connection')) @@ -61,54 +74,65 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr return self._manager @property - def gvoice_backend(self): - return self._backend - - @property - def addressbook(self): - return self._addressbook + 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): """ For org.freedesktop.telepathy.Connection """ + _moduleLogger.info("Connecting...") self.StatusChanged( telepathy.CONNECTION_STATUS_CONNECTING, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) try: - self._backend.login(*self._credentials) - self._backend.set_callback_number(self._callbackNumber) - except gvoice.dialer.NetworkError: + self.session.conversations.updateSignalHandler.register_sink( + self._on_conversations_updated + ) + 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: + 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._backend.logout() + self.session.conversations.updateSignalHandler.unregister_sink( + self._on_conversations_updated + ) + self._channelManager.close() + self.session.logout() _moduleLogger.info("Disconnected") except Exception: _moduleLogger.exception("Disconnecting Failed") @@ -117,6 +141,7 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr telepathy.CONNECTION_STATUS_REASON_REQUESTED ) + @gtk_toolbox.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): """ For org.freedesktop.telepathy.Connection @@ -127,29 +152,32 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr @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) + 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) @@ -158,29 +186,36 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr 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) + raise telepathy.errors.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 - - contacts = self._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 + @gtk_toolbox.log_exception(_moduleLogger) + def _on_conversations_updated(self, conversationIds): + # @todo get conversations update running + # @todo test conversatiuons + _moduleLogger.info("Incoming messages from: %r" % (conversationIds, )) + 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)