X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=1ad2487fa411839b331572fb44773f4db385e023;hp=b0979938f7298fdebf0f878263b2a73e01c9efc4;hb=d4b136496c94a847232c2454a0732984aa43e56d;hpb=69291b6ea410825bc288f4071e4a2bd200bdac2e diff --git a/src/connection.py b/src/connection.py index b097993..1ad2487 100644 --- a/src/connection.py +++ b/src/connection.py @@ -6,24 +6,24 @@ import telepathy import constants import tp -import util.go_utils as gobject_utils import util.misc as misc_utils import gvoice import handle -import requests -import contacts import aliasing -import simple_presence -import presence +import avatars import capabilities +import contacts +import presence +import requests +import simple_presence import autogv import channel_manager -_moduleLogger = logging.getLogger("connection") +_moduleLogger = logging.getLogger(__name__) class TheOneRingOptions(object): @@ -50,12 +50,13 @@ class TheOneRingOptions(object): class TheOneRingConnection( tp.Connection, - requests.RequestsMixin, - contacts.ContactsMixin, aliasing.AliasingMixin, - simple_presence.SimplePresenceMixin, - presence.PresenceMixin, + avatars.AvatarsMixin, capabilities.CapabilitiesMixin, + contacts.ContactsMixin, + presence.PresenceMixin, + requests.RequestsMixin, + simple_presence.SimplePresenceMixin, ): # overiding base class variable @@ -84,6 +85,8 @@ class TheOneRingConnection( @misc_utils.log_exception(_moduleLogger) def __init__(self, manager, parameters): + self._loggers = [] + self.check_parameters(parameters) account = unicode(parameters['account']) encodedAccount = parameters['account'].encode('utf-8') @@ -108,12 +111,13 @@ class TheOneRingConnection( 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) + avatars.AvatarsMixin.__init__(self) capabilities.CapabilitiesMixin.__init__(self) + contacts.ContactsMixin.__init__(self) + presence.PresenceMixin.__init__(self) + requests.RequestsMixin.__init__(self) + simple_presence.SimplePresenceMixin.__init__(self) self.__manager = weakref.proxy(manager) self.__credentials = ( @@ -135,10 +139,12 @@ class TheOneRingConnection( autogv.NewGVConversations(weakref.ref(self)), autogv.RefreshVoicemail(weakref.ref(self)), autogv.AutoDisconnect(weakref.ref(self)), + autogv.DelayEnableContactIntegration(constants._telepathy_implementation_name_), ] - self._delayedConnect = gobject_utils.Async(self._delayed_connect) _moduleLogger.info("Connection to the account %s created" % account) + self._timedDisconnect = autogv.TimedDisconnect(weakref.ref(self)) + self._timedDisconnect.start() @property def manager(self): @@ -162,17 +168,38 @@ class TheOneRingConnection( def get_handle_by_name(self, handleType, handleName): requestedHandleName = handleName.encode('utf-8') + + # We need to return an existing or create a new handle. Unfortunately + # handle init's take care of normalizing the handle name. So we have + # to create a new handle regardless and burn some handle id's and burn + # some extra memory of creating objects we throw away if the handle + # already exists. if handleType == telepathy.HANDLE_TYPE_CONTACT: - _moduleLogger.debug("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.debug("get_handle_by_name List: %s" % requestedHandleName) h = handle.create_handle(self, 'list', requestedHandleName) else: raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType) + + for candidate in self._handles.itervalues(): + if candidate.get_name() == h.get_name(): + h = candidate + _moduleLogger.debug("Re-used handle for %s, I hoped this helped" % handleName) + break + return h + def log_to_user(self, component, message): + for logger in self._loggers: + logger.log_message(component, message) + + def add_logger(self, logger): + self._loggers.append(logger) + + def remove_logger(self, logger): + self._loggers.remove(logger) + @property def _channel_manager(self): return self.__channelManager @@ -185,22 +212,27 @@ class TheOneRingConnection( if self._status != telepathy.CONNECTION_STATUS_DISCONNECTED: _moduleLogger.info("Attempting connect when not disconnected") return - _moduleLogger.info("Kicking off connect") - self._delayedConnect.start() - - @misc_utils.log_exception(_moduleLogger) - def _delayed_connect(self): _moduleLogger.info("Connecting...") self.StatusChanged( telepathy.CONNECTION_STATUS_CONNECTING, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) + self._timedDisconnect.stop() + self.session.login( + self.__credentials[0], + self.__credentials[1], + self._on_login, + self._on_login_error, + ) + + @misc_utils.log_exception(_moduleLogger) + def _on_login(self, *args): + _moduleLogger.info("Connected, setting up...") try: self.__session.load(self.__cachePath) for plumber in self._plumbing: plumber.start() - self.session.login(*self.__credentials) if not self.__callbackNumberParameter: callback = gvoice.backend.get_sane_callback( self.session.backend @@ -214,28 +246,34 @@ class TheOneRingConnection( publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish") publishProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False) self.__channelManager.channel_for_props(publishProps, signal=True) - except gvoice.backend.NetworkError, e: - _moduleLogger.exception("Connection Failed") - self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR) - return - except Exception, e: - _moduleLogger.exception("Connection Failed") + except Exception: + _moduleLogger.exception("Setup failed") self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED) return - _moduleLogger.info("Connected") + _moduleLogger.info("Connected and set up") self.StatusChanged( telepathy.CONNECTION_STATUS_CONNECTED, telepathy.CONNECTION_STATUS_REASON_REQUESTED ) @misc_utils.log_exception(_moduleLogger) + def _on_login_error(self, error): + _moduleLogger.error(error) + if isinstance(error, StopIteration): + pass + elif isinstance(error, gvoice.backend.NetworkError): + self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR) + else: + self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED) + + @misc_utils.log_exception(_moduleLogger) def Disconnect(self): """ For org.freedesktop.telepathy.Connection """ _moduleLogger.info("Kicking off disconnect") - self._delayed_disconnect() + self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED) @misc_utils.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): @@ -274,15 +312,10 @@ class TheOneRingConnection( return props - @gobject_utils.async - def _delayed_disconnect(self): - self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED) - return False - def disconnect(self, reason): _moduleLogger.info("Disconnecting") - self._delayedConnect.cancel() + self._timedDisconnect.stop() # Not having the disconnect first can cause weird behavior with clients # including not being able to reconnect or even crashing @@ -295,9 +328,15 @@ class TheOneRingConnection( plumber.stop() self.__channelManager.close() + self.manager.disconnected(self) + self.session.save(self.__cachePath) self.session.logout() self.session.close() - self.manager.disconnected(self) + # In case one of the above items takes too long (which it should never + # do), we leave the starting of the shutdown-on-idle counter to the + # very end + self.manager.disconnect_completed() + _moduleLogger.info("Disconnected")