X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=41c0a6df85f6f53a1054decdb051ccbf5631d2b1;hp=31ecd531429e7f5834b11fbf17a3c19fcd6b908b;hb=1efc4f7ce81e252e1f956a4dc6864e6c3423be27;hpb=3b43bd098274b1944cf6dc252ec1d53b0a0ba4cb diff --git a/src/connection.py b/src/connection.py index 31ecd53..41c0a6d 100644 --- a/src/connection.py +++ b/src/connection.py @@ -6,7 +6,6 @@ import telepathy import constants import tp -import util.go_utils as gobject_utils import util.misc as misc_utils import gvoice @@ -29,6 +28,8 @@ _moduleLogger = logging.getLogger(__name__) class TheOneRingOptions(object): + ignoreDND = True + useGVContacts = True assert gvoice.session.Session._DEFAULTS["contacts"][1] == "hours" @@ -43,6 +44,7 @@ class TheOneRingOptions(object): def __init__(self, parameters = None): if parameters is None: return + self.ignoreDND = parameters["ignore-dnd"] self.useGVContacts = parameters["use-gv-contacts"] self.contactsPollPeriodInHours = parameters['contacts-poll-period-in-hours'] self.voicemailPollPeriodInMinutes = parameters['voicemail-poll-period-in-minutes'] @@ -55,9 +57,10 @@ class TheOneRingConnection( avatars.AvatarsMixin, capabilities.CapabilitiesMixin, contacts.ContactsMixin, - presence.PresenceMixin, requests.RequestsMixin, + simple_presence.TheOneRingPresence, simple_presence.SimplePresenceMixin, + presence.PresenceMixin, ): # overiding base class variable @@ -68,6 +71,7 @@ class TheOneRingConnection( # overiding base class variable _optional_parameters = { 'forward': 's', + 'ignore-dnd': 'b', 'use-gv-contacts': 'b', 'contacts-poll-period-in-hours': 'i', 'voicemail-poll-period-in-minutes': 'i', @@ -75,6 +79,7 @@ class TheOneRingConnection( } _parameter_defaults = { 'forward': '', + 'ignore-dnd': TheOneRingOptions.ignoreDND, 'use-gv-contacts': TheOneRingOptions.useGVContacts, 'contacts-poll-period-in-hours': TheOneRingOptions.contactsPollPeriodInHours, 'voicemail-poll-period-in-minutes': TheOneRingOptions.voicemailPollPeriodInMinutes, @@ -86,6 +91,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') @@ -97,7 +104,7 @@ class TheOneRingConnection( # Connection init must come first self.__options = TheOneRingOptions(parameters) self.__session = gvoice.session.Session( - cookiePath = None, + cookiePath = os.path.join(constants._data_path_, "%s.cookies" % account), defaults = { "contacts": (self.__options.contactsPollPeriodInHours, "hours"), "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"), @@ -114,9 +121,10 @@ class TheOneRingConnection( 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) + simple_presence.TheOneRingPresence.__init__(self, self.__options.ignoreDND) + simple_presence.SimplePresenceMixin.__init__(self, self) + presence.PresenceMixin.__init__(self, self) self.__manager = weakref.proxy(manager) self.__credentials = ( @@ -140,7 +148,6 @@ class TheOneRingConnection( 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)) @@ -168,6 +175,12 @@ 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: h = handle.create_handle(self, 'contact', requestedHandleName) elif handleType == telepathy.HANDLE_TYPE_LIST: @@ -175,8 +188,25 @@ class TheOneRingConnection( 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 @@ -189,23 +219,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() - self._timedDisconnect.stop() - - @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 @@ -219,22 +253,28 @@ 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: - _moduleLogger.exception("Connection Failed") - self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR) - return except Exception: - _moduleLogger.exception("Connection Failed") + _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 @@ -282,7 +322,6 @@ class TheOneRingConnection( def disconnect(self, reason): _moduleLogger.info("Disconnecting") - self._delayedConnect.cancel() self._timedDisconnect.stop() # Not having the disconnect first can cause weird behavior with clients @@ -299,12 +338,12 @@ class TheOneRingConnection( self.manager.disconnected(self) self.session.save(self.__cachePath) - self.session.logout() + self.session.shutdown() self.session.close() # 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(self) + self.manager.disconnect_completed() _moduleLogger.info("Disconnected")