import constants
import tp
-import util.go_utils as gobject_utils
import util.misc as misc_utils
import gvoice
class TheOneRingOptions(object):
+ ignoreDND = True
+
useGVContacts = True
assert gvoice.session.Session._DEFAULTS["contacts"][1] == "hours"
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']
avatars.AvatarsMixin,
capabilities.CapabilitiesMixin,
contacts.ContactsMixin,
- presence.PresenceMixin,
requests.RequestsMixin,
+ simple_presence.TheOneRingPresence,
simple_presence.SimplePresenceMixin,
+ presence.PresenceMixin,
):
# overiding base class variable
# 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',
}
_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,
@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')
# Connection init must come first
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"),
- },
- )
+ self.__accountName = account
+ self.__session = None
tp.Connection.__init__(
self,
constants._telepathy_protocol_name_,
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 = (
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))
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:
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 force_log_display(self):
+ accountNumber = misc_utils.normalize_number(self.session.backend.get_account_number())
+ debugHandle = self.get_handle_by_name(
+ telepathy.HANDLE_TYPE_CONTACT,
+ accountNumber,
+ )
+ debugPromptProps = self.generate_props(telepathy.CHANNEL_TYPE_TEXT, debugHandle, False)
+ self.__channelManager.channel_for_props(debugPromptProps, signal=True)
+
+ 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
"""
For org.freedesktop.telepathy.Connection
"""
+ if self.__session is None:
+ self.__session = gvoice.session.Session(
+ cookiePath = os.path.join(constants._data_path_, "%s.cookies" % self.__accountName),
+ defaults = {
+ "contacts": (self.__options.contactsPollPeriodInHours, "hours"),
+ "voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
+ "texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
+ },
+ )
+
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)
+ 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
subscribeHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "subscribe")
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)
- 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
def disconnect(self, reason):
_moduleLogger.info("Disconnecting")
- self._delayedConnect.cancel()
self._timedDisconnect.stop()
# Not having the disconnect first can cause weird behavior with clients
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
projects / theonering / blobdiff