X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=b0979938f7298fdebf0f878263b2a73e01c9efc4;hp=e94e0b8c3e1f83ab7290e1411e56d889c5746f91;hb=69291b6ea410825bc288f4071e4a2bd200bdac2e;hpb=b5952a89cc8688e13329c9b6198a8b8498167208 diff --git a/src/connection.py b/src/connection.py index e94e0b8..b097993 100644 --- a/src/connection.py +++ b/src/connection.py @@ -1,28 +1,13 @@ - -""" -@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 -""" - - import os import weakref import logging import telepathy -try: - import conic as _conic - conic = _conic -except (ImportError, OSError): - conic = None - import constants import tp -import util.coroutines as coroutines -import util.misc as util_misc -import gtk_toolbox +import util.go_utils as gobject_utils +import util.misc as misc_utils import gvoice import handle @@ -34,12 +19,35 @@ import simple_presence import presence import capabilities +import autogv import channel_manager _moduleLogger = logging.getLogger("connection") +class TheOneRingOptions(object): + + useGVContacts = True + + assert gvoice.session.Session._DEFAULTS["contacts"][1] == "hours" + contactsPollPeriodInHours = gvoice.session.Session._DEFAULTS["contacts"][0] + + assert gvoice.session.Session._DEFAULTS["voicemail"][1] == "minutes" + voicemailPollPeriodInMinutes = gvoice.session.Session._DEFAULTS["voicemail"][0] + + assert gvoice.session.Session._DEFAULTS["texts"][1] == "minutes" + textsPollPeriodInMinutes = gvoice.session.Session._DEFAULTS["texts"][0] + + def __init__(self, parameters = None): + if parameters is None: + return + self.useGVContacts = parameters["use-gv-contacts"] + self.contactsPollPeriodInHours = parameters['contacts-poll-period-in-hours'] + self.voicemailPollPeriodInMinutes = parameters['voicemail-poll-period-in-minutes'] + self.textsPollPeriodInMinutes = parameters['texts-poll-period-in-minutes'] + + class TheOneRingConnection( tp.Connection, requests.RequestsMixin, @@ -52,32 +60,48 @@ class TheOneRingConnection( # overiding base class variable _mandatory_parameters = { - 'account' : 's', - 'password' : 's', + 'account': 's', + 'password': 's', } # overiding base class variable _optional_parameters = { - 'forward' : 's', + 'forward': 's', + 'use-gv-contacts': 'b', + 'contacts-poll-period-in-hours': 'i', + 'voicemail-poll-period-in-minutes': 'i', + 'texts-poll-period-in-minutes': 'i', } _parameter_defaults = { - 'forward' : '', + 'forward': '', + 'use-gv-contacts': TheOneRingOptions.useGVContacts, + 'contacts-poll-period-in-hours': TheOneRingOptions.contactsPollPeriodInHours, + 'voicemail-poll-period-in-minutes': TheOneRingOptions.voicemailPollPeriodInMinutes, + 'texts-poll-period-in-minutes': TheOneRingOptions.textsPollPeriodInMinutes, } _secret_parameters = set(( "password", )) - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def __init__(self, manager, parameters): self.check_parameters(parameters) 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): + encodedCallback = misc_utils.normalize_number(parameters['forward'].encode('utf-8')) + if encodedCallback and not misc_utils.is_valid_number(encodedCallback): raise telepathy.errors.InvalidArgument("Invalid forwarding number") # Connection init must come first - self.__session = gvoice.session.Session(None) + self.__options = TheOneRingOptions(parameters) + self.__session = gvoice.session.Session( + cookiePath = None, + defaults = { + "contacts": (self.__options.contactsPollPeriodInHours, "hours"), + "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"), + "texts": (self.__options.textsPollPeriodInMinutes, "minutes"), + }, + ) tp.Connection.__init__( self, constants._telepathy_protocol_name_, @@ -99,10 +123,6 @@ class TheOneRingConnection( self.__callbackNumberParameter = encodedCallback self.__channelManager = channel_manager.ChannelManager(self) - if conic is not None: - self.__connection = conic.Connection() - else: - self.__connection = None self.__cachePath = os.sep.join((constants._data_path_, "cache", self.username)) try: os.makedirs(self.__cachePath) @@ -111,8 +131,13 @@ class TheOneRingConnection( raise self.set_self_handle(handle.create_handle(self, 'connection')) + self._plumbing = [ + autogv.NewGVConversations(weakref.ref(self)), + autogv.RefreshVoicemail(weakref.ref(self)), + autogv.AutoDisconnect(weakref.ref(self)), + ] + self._delayedConnect = gobject_utils.Async(self._delayed_connect) - self.__callback = None _moduleLogger.info("Connection to the account %s created" % account) @property @@ -124,6 +149,10 @@ class TheOneRingConnection( return self.__session @property + def options(self): + return self.__options + + @property def username(self): return self.__credentials[0] @@ -134,11 +163,11 @@ class TheOneRingConnection( 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) + _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.info("get_handle_by_name List: %s" % requestedHandleName) + _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) @@ -148,11 +177,19 @@ class TheOneRingConnection( def _channel_manager(self): return self.__channelManager - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def Connect(self): """ For org.freedesktop.telepathy.Connection """ + 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, @@ -161,44 +198,29 @@ class TheOneRingConnection( try: 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 - ) + 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 ) - self.__callbackNumberParameter = util_misc.normalize_number(callback) + self.__callbackNumberParameter = misc_utils.normalize_number(callback) self.session.backend.set_callback_number(self.__callbackNumberParameter) subscribeHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "subscribe") - subscribeProps = self._generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, subscribeHandle, False) + subscribeProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, subscribeHandle, False) self.__channelManager.channel_for_props(subscribeProps, signal=True) publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish") - publishProps = self._generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False) + 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.StatusChanged( - telepathy.CONNECTION_STATUS_DISCONNECTED, - telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR - ) + self.disconnect(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 - ) + self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED) return _moduleLogger.info("Connected") @@ -206,24 +228,16 @@ class TheOneRingConnection( 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) + @misc_utils.log_exception(_moduleLogger) def Disconnect(self): """ For org.freedesktop.telepathy.Connection """ - self.StatusChanged( - telepathy.CONNECTION_STATUS_DISCONNECTED, - telepathy.CONNECTION_STATUS_REASON_REQUESTED - ) - try: - self._disconnect() - except Exception: - _moduleLogger.exception("Error durring disconnect") + _moduleLogger.info("Kicking off disconnect") + self._delayed_disconnect() - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RequestChannel(self, type, handleType, handleId, suppressHandler): """ For org.freedesktop.telepathy.Connection @@ -237,7 +251,7 @@ class TheOneRingConnection( self.check_handle(handleType, handleId) h = self.get_handle_by_id(handleType, handleId) if handleId != 0 else None - props = self._generate_props(type, h, suppressHandler) + props = self.generate_props(type, h, suppressHandler) self._validate_handle(props) chan = self.__channelManager.channel_for_props(props, signal=True) @@ -245,9 +259,9 @@ class TheOneRingConnection( _moduleLogger.info("RequestChannel Object Path (%s): %s" % (type.rsplit(".", 1)[-1], 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() + def generate_props(self, channelType, handleObj, suppressHandler, initiatorHandle=None): + targetHandle = 0 if handleObj is None else handleObj.get_id() + targetHandleType = telepathy.HANDLE_TYPE_NONE if handleObj is None else handleObj.get_type() props = { telepathy.CHANNEL_INTERFACE + '.ChannelType': channelType, telepathy.CHANNEL_INTERFACE + '.TargetHandle': targetHandle, @@ -260,15 +274,25 @@ class TheOneRingConnection( return props - def _disconnect(self): + @gobject_utils.async + def _delayed_disconnect(self): + self.disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED) + return False + + def disconnect(self, reason): _moduleLogger.info("Disconnecting") - self.session.voicemails.updateSignalHandler.unregister_sink( - self.__callback - ) - self.session.texts.updateSignalHandler.unregister_sink( - self.__callback + + self._delayedConnect.cancel() + + # Not having the disconnect first can cause weird behavior with clients + # including not being able to reconnect or even crashing + self.StatusChanged( + telepathy.CONNECTION_STATUS_DISCONNECTED, + reason, ) - self.__callback = None + + for plumber in self._plumbing: + plumber.stop() self.__channelManager.close() self.session.save(self.__cachePath) @@ -277,54 +301,3 @@ class TheOneRingConnection( self.manager.disconnected(self) _moduleLogger.info("Disconnected") - - @gtk_toolbox.log_exception(_moduleLogger) - 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) - if self.__channelManager.channel_exists(props): - continue - - # Maemo 4.1's RTComm opens a window for a chat regardless if a - # message is received or not, so we need to do some filtering here - mergedConv = conv.get_conversation(phoneNumber) - unreadConvs = [ - conversation - for conversation in mergedConv.conversations - if not conversation.isRead and not conversation.isArchived - ] - if not unreadConvs: - continue - - chan = self.__channelManager.channel_for_props(props, signal=True) - - @gtk_toolbox.log_exception(_moduleLogger) - def _on_connection_change(self, connection, event): - """ - @note Maemo specific - - @todo Make this delayed to handle background switching of networks. First I need to verify I receive connected - """ - if not self.session.is_logged_in(): - _moduleLogger.info("Received connection change event when not logged in") - return - status = event.get_status() - error = event.get_error() - iap_id = event.get_iap_id() - bearer = event.get_bearer_type() - - 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, ))