X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=7b454127dacbf52ee493d15e8983413a69dc6750;hp=3e90f30cc720fb028059ba2bab805c1820449773;hb=b3994c75e30db01e5c8995981adfb6949a184092;hpb=3ab35a51a6877a87ce3e95d5e2fb0c743a6f1a92 diff --git a/src/connection.py b/src/connection.py index 3e90f30..7b45412 100644 --- a/src/connection.py +++ b/src/connection.py @@ -1,16 +1,40 @@ + +""" +@todo Add params for different state machines update times +@todo Get a callback for missed calls to force an update of the voicemail state machine +@todo Get a callback on an incoming call and if its from GV, auto-pickup +@todo Decide if we should do what the spec suggests and hold onto a singleton contactlist +""" + + +import os import weakref import logging import telepathy +try: + import conic as _conic + conic = _conic +except (ImportError, OSError): + conic = None + import constants -import util.go_utils as gobject_utils +import tp import util.coroutines as coroutines +import util.misc as util_misc import gtk_toolbox + import gvoice import handle + +import requests +import contacts import aliasing import simple_presence +import presence +import capabilities + import channel_manager @@ -18,72 +42,114 @@ _moduleLogger = logging.getLogger("connection") class TheOneRingConnection( - telepathy.server.Connection, + tp.Connection, + requests.RequestsMixin, + contacts.ContactsMixin, aliasing.AliasingMixin, simple_presence.SimplePresenceMixin, + presence.PresenceMixin, + capabilities.CapabilitiesMixin, ): - # Overriding a base class variable - # Should the forwarding number be handled by the alias or by an option? + # overiding base class variable _mandatory_parameters = { - 'username' : 's', + 'account' : 's', 'password' : 's', - 'forward' : 's', } - # Overriding a base class variable + # overiding base class variable _optional_parameters = { + 'forward' : 's', } _parameter_defaults = { + 'forward' : '', } + _secret_parameters = set(( + "password", + )) + @gtk_toolbox.log_exception(_moduleLogger) def __init__(self, manager, parameters): self.check_parameters(parameters) - try: - 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) + account = unicode(parameters['account']) + encodedAccount = parameters['account'].encode('utf-8') + encodedPassword = parameters['password'].encode('utf-8') + encodedCallback = util_misc.normalize_number(parameters['forward'].encode('utf-8')) + if encodedCallback and not util_misc.is_valid_number(encodedCallback): + raise telepathy.errors.InvalidArgument("Invalid forwarding number") - self._manager = weakref.proxy(manager) - self._credentials = ( - parameters['username'].encode('utf-8'), - parameters['password'].encode('utf-8'), - ) - self._callbackNumber = parameters['forward'].encode('utf-8') - self._channelManager = channel_manager.ChannelManager(self) + # Connection init must come first + self.__session = gvoice.session.Session(None) + tp.Connection.__init__( + self, + constants._telepathy_protocol_name_, + account, + constants._telepathy_implementation_name_ + ) + requests.RequestsMixin.__init__(self) + contacts.ContactsMixin.__init__(self) + aliasing.AliasingMixin.__init__(self) + simple_presence.SimplePresenceMixin.__init__(self) + presence.PresenceMixin.__init__(self) + capabilities.CapabilitiesMixin.__init__(self) + + self.__manager = weakref.proxy(manager) + self.__credentials = ( + encodedAccount, + encodedPassword, + ) + self.__callbackNumberParameter = encodedCallback + self.__channelManager = channel_manager.ChannelManager(self) - cookieFilePath = "%s/cookies.txt" % constants._data_path_ - self._session = gvoice.session.Session(cookieFilePath) + if conic is not None: + self.__connection = conic.Connection() + self.__connectionEventId = None + else: + self.__connection = None + self.__connectionEventId = None + self.__cachePath = os.sep.join((constants._data_path_, "cache", self.username)) + try: + os.makedirs(self.__cachePath) + except OSError, e: + if e.errno != 17: + raise - self.set_self_handle(handle.create_handle(self, 'connection')) + self.set_self_handle(handle.create_handle(self, 'connection')) - _moduleLogger.info("Connection to the account %s created" % account) - except Exception, e: - _moduleLogger.exception("Failed to create Connection") - raise + self.__callback = None + _moduleLogger.info("Connection to the account %s created" % account) @property def manager(self): - return self._manager + return self.__manager @property def session(self): - return self._session + return self.__session @property def username(self): - return self._credentials[0] + return self.__credentials[0] - def handle(self, handleType, handleId): - self.check_handle(handleType, handleId) - return self._handles[handleType, handleId] + @property + def callbackNumberParameter(self): + return self.__callbackNumberParameter + + def get_handle_by_name(self, handleType, handleName): + requestedHandleName = handleName.encode('utf-8') + if handleType == telepathy.HANDLE_TYPE_CONTACT: + _moduleLogger.info("get_handle_by_name Contact: %s" % requestedHandleName) + h = handle.create_handle(self, 'contact', requestedHandleName) + elif handleType == telepathy.HANDLE_TYPE_LIST: + # Support only server side (immutable) lists + _moduleLogger.info("get_handle_by_name List: %s" % requestedHandleName) + h = handle.create_handle(self, 'list', requestedHandleName) + else: + raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType) + return h + + @property + def _channel_manager(self): + return self.__channelManager @gtk_toolbox.log_exception(_moduleLogger) def Connect(self): @@ -96,44 +162,62 @@ class TheOneRingConnection( telepathy.CONNECTION_STATUS_REASON_REQUESTED ) try: - self.session.login(*self._credentials) - self.session.backend.set_callback_number(self._callbackNumber) + self.__session.load(self.__cachePath) + + self.__callback = coroutines.func_sink( + coroutines.expand_positional( + self._on_conversations_updated + ) + ) + self.session.voicemails.updateSignalHandler.register_sink( + self.__callback + ) + self.session.texts.updateSignalHandler.register_sink( + self.__callback + ) + self.session.login(*self.__credentials) + if not self.__callbackNumberParameter: + callback = gvoice.backend.get_sane_callback( + self.session.backend + ) + self.__callbackNumberParameter = util_misc.normalize_number(callback) + self.session.backend.set_callback_number(self.__callbackNumberParameter) except gvoice.backend.NetworkError, e: _moduleLogger.exception("Connection Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR ) + return 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 - ) + return + + _moduleLogger.info("Connected") + self.StatusChanged( + telepathy.CONNECTION_STATUS_CONNECTED, + telepathy.CONNECTION_STATUS_REASON_REQUESTED + ) + if self.__connection is not None: + self.__connectionEventId = self.__connection.connect("connection-event", self._on_connection_change) @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() - self._channelManager.close() - _moduleLogger.info("Disconnected") - except Exception: - _moduleLogger.exception("Disconnecting Failed") self.StatusChanged( telepathy.CONNECTION_STATUS_DISCONNECTED, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) + try: + self._disconnect() + except Exception: + _moduleLogger.exception("Error durring disconnect") @gtk_toolbox.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): @@ -148,66 +232,82 @@ class TheOneRingConnection( 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: - _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.errors.NotImplemented("unknown channel type %s" % type) + h = self.get_handle_by_id(handleType, handleId) if handleId != 0 else None + props = self._generate_props(type, h, suppressHandler) + self._validate_handle(props) + + chan = self.__channelManager.channel_for_props(props, signal=True) + path = chan._object_path + _moduleLogger.info("RequestChannel Object Path: %s" % path) + return path + + def _generate_props(self, channelType, handle, suppressHandler, initiatorHandle=None): + targetHandle = 0 if handle is None else handle.get_id() + targetHandleType = telepathy.HANDLE_TYPE_NONE if handle is None else handle.get_type() + props = { + telepathy.CHANNEL_INTERFACE + '.ChannelType': channelType, + telepathy.CHANNEL_INTERFACE + '.TargetHandle': targetHandle, + telepathy.CHANNEL_INTERFACE + '.TargetHandleType': targetHandleType, + telepathy.CHANNEL_INTERFACE + '.Requested': suppressHandler + } + + if initiatorHandle is not None: + props[telepathy.CHANNEL_INTERFACE + '.InitiatorHandle'] = initiatorHandle.id + + return props + + def _disconnect(self): + _moduleLogger.info("Disconnecting") + self.session.voicemails.updateSignalHandler.unregister_sink( + self.__callback + ) + self.session.texts.updateSignalHandler.unregister_sink( + self.__callback + ) + self.__callback = None + + self.__channelManager.close() + self.session.save(self.__cachePath) + self.session.logout() + self.session.close() + self.__session = None + if self.__connection is not None: + self.__connection.disconnect(self.__connectionEventId) + self.__connectionEventId = None - _moduleLogger.info("RequestChannel Object Path: %s" % channel._object_path) - return channel._object_path + self.manager.disconnected(self) + _moduleLogger.info("Disconnected") @gtk_toolbox.log_exception(_moduleLogger) - def RequestHandles(self, handleType, names, sender): + def _on_conversations_updated(self, conv, conversationIds): + _moduleLogger.debug("Incoming messages from: %r" % (conversationIds, )) + for phoneNumber in conversationIds: + h = self.get_handle_by_name(telepathy.HANDLE_TYPE_CONTACT, phoneNumber) + # Just let the TextChannel decide whether it should be reported to the user or not + props = self._generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False) + chan = self.__channelManager.channel_for_props(props, signal=True) + + @gtk_toolbox.log_exception(_moduleLogger) + def _on_connection_change(self, connection, event): """ - For org.freedesktop.telepathy.Connection - Overiding telepathy.server.Connecton to allow custom handles + @note Maemo specific + + @todo Make this delayed to handle background switching of networks. First I need to verify I receive connected """ - self.check_connected() - 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) - else: - 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, requestedHandleName): - requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name( - requestedHandleName - ) - h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber) - return h + status = event.get_status() + error = event.get_error() + iap_id = event.get_iap_id() + bearer = event.get_bearer_type() - @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) + if status == conic.STATUS_DISCONNECTED: + _moduleLogger.info("Disconnecting due to loss of network connection") + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR + ) + try: + self._disconnect() + except Exception: + _moduleLogger.exception("Error durring disconnect") + else: + _moduleLogger.info("Other status: %r" % (status, ))