+
+"""
+@todo Add params for disable/enable state machines
+@todo Separate voicemail/sms into separate conversation instances
+@todo Setup addressbook, voicemail, sms state machines
+@todo Add option to use screen name as callback
+"""
+
+
import weakref
import logging
import telepathy
import constants
+import util.go_utils as gobject_utils
+import util.coroutines as coroutines
+import gtk_toolbox
import gvoice
import handle
-import channel_manager
+import aliasing
import simple_presence
+import presence
+import capabilities
+import channel_manager
_moduleLogger = logging.getLogger("connection")
-class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePresenceMixin):
+class TheOneRingConnection(
+ telepathy.server.Connection,
+ aliasing.AliasingMixin,
+ simple_presence.SimplePresenceMixin,
+ presence.PresenceMixin,
+ capabilities.CapabilitiesMixin,
+):
- MANDATORY_PARAMETERS = {
+ # Overriding a base class variable
+ # Should the forwarding number be handled by the alias or by an option?
+ _mandatory_parameters = {
'account' : 's',
'password' : 's',
'forward' : 's',
}
- OPTIONAL_PARAMETERS = {
+ # Overriding a base class variable
+ _optional_parameters = {
}
- PARAMETER_DEFAULTS = {
+ _parameter_defaults = {
}
+ @gtk_toolbox.log_exception(_moduleLogger)
def __init__(self, manager, parameters):
- try:
- self.check_parameters(parameters)
- account = unicode(parameters['account'])
-
- telepathy.server.Connection.__init__(
- self,
- constants._telepathy_protocol_name_,
- account,
- constants._telepathy_implementation_name_
- )
-
- self._manager = weakref.proxy(manager)
- self._credentials = (
- parameters['account'].encode('utf-8'),
- parameters['password'].encode('utf-8'),
- )
- self._callbackNumber = parameters['forward'].encode('utf-8')
- self._channelManager = channel_manager.ChannelManager(self)
+ self.check_parameters(parameters)
+ account = unicode(parameters['account'])
+ encodedAccount = parameters['account'].encode('utf-8')
+ encodedPassword = parameters['password'].encode('utf-8')
+ encodedCallback = parameters['forward'].encode('utf-8')
+ if not encodedCallback:
+ raise telepathy.errors.InvalidArgument("User must specify what number GV forwards calls to")
+
+ # 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)
+ presence.PresenceMixin.__init__(self)
+ capabilities.CapabilitiesMixin.__init__(self)
+
+ self._manager = weakref.proxy(manager)
+ self._credentials = (
+ encodedAccount,
+ encodedPassword,
+ )
+ self._callbackNumber = encodedCallback
+ self._channelManager = channel_manager.ChannelManager(self)
- cookieFilePath = "%s/cookies.txt" % constants._data_path_
- self._backend = gvoice.dialer.GVDialer(cookieFilePath)
- self._addressbook = gvoice.addressbook.Addressbook(self._backend)
+ self._session = gvoice.session.Session(None)
- 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
@property
- def gvoice_backend(self):
- return self._backend
+ def session(self):
+ return self._session
@property
- def addressbook(self):
- return self._addressbook
+ def username(self):
+ return self._credentials[0]
@property
- def username(self):
- self._credentials[0]
+ def userAliasType(self):
+ return self.USER_ALIAS_ACCOUNT
def handle(self, handleType, handleId):
self.check_handle(handleType, handleId)
return self._handles[handleType, handleId]
+ @gtk_toolbox.log_exception(_moduleLogger)
def Connect(self):
"""
For org.freedesktop.telepathy.Connection
"""
+ _moduleLogger.info("Connecting...")
self.StatusChanged(
telepathy.CONNECTION_STATUS_CONNECTING,
telepathy.CONNECTION_STATUS_REASON_REQUESTED
)
try:
- self._backend.login(*self._credentials)
- self._backend.set_callback_number(self._callbackNumber)
- except gvoice.dialer.NetworkError:
+ cookieFilePath = None
+ self._session = gvoice.session.Session(cookieFilePath)
+
+ self._callback = coroutines.func_sink(
+ coroutines.expand_positional(
+ self._on_conversations_updated
+ )
+ )
+ self.session.conversations.updateSignalHandler.register_sink(
+ self._callback
+ )
+ self.session.login(*self._credentials)
+ self.session.backend.set_callback_number(self._callbackNumber)
+ except gvoice.backend.NetworkError, e:
+ _moduleLogger.exception("Connection Failed")
self.StatusChanged(
telepathy.CONNECTION_STATUS_DISCONNECTED,
telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR
)
- except Exception:
+ 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
)
+ @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._backend.logout()
+ self.session.conversations.updateSignalHandler.unregister_sink(
+ self._callback
+ )
+ self._callback = None
+ self._channelManager.close()
+ self.session.logout()
+ self.session.close()
+ self._session = None
_moduleLogger.info("Disconnected")
except Exception:
_moduleLogger.exception("Disconnecting Failed")
telepathy.CONNECTION_STATUS_DISCONNECTED,
telepathy.CONNECTION_STATUS_REASON_REQUESTED
)
+ self.manager.disconnected(self)
+ @gtk_toolbox.log_exception(_moduleLogger)
def RequestChannel(self, type, handleType, handleId, suppressHandler):
"""
For org.freedesktop.telepathy.Connection
@returns DBus object path for the channel created or retrieved
"""
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:
- channel = channelManager.channel_for_list(handle, suppressHandler)
- elif type == telepathy.CHANNEL_TYPE_TEXT:
- if handleType != telepathy.HANDLE_TYPE_CONTACT:
- raise telepathy.NotImplemented("Only Contacts are allowed")
- channel = channelManager.channel_for_text(handle, None, suppressHandler)
- elif type == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
- if handleType != telepathy.HANDLE_TYPE_CONTACT:
- raise telepathy.NotImplemented("Only Contacts are allowed")
- channel = channelManager.channel_for_text(handle, None, suppressHandler)
- else:
- raise telepathy.NotImplemented("unknown channel type %s" % type)
+ h = self.handle(handleType, handleId) if handleId != 0 else None
+ props = self._generate_props(type, h, suppressHandler)
+ if hasattr(self, "_validate_handle"):
+ # HACK Newer python-telepathy
+ self._validate_handle(props)
- return channel._object_path
+ chan = self._channelManager.channel_for_props(props, signal=True)
+ path = chan._object_path
+ _moduleLogger.info("RequestChannel Object Path: %s" % path)
+ return path
+ @gtk_toolbox.log_exception(_moduleLogger)
def RequestHandles(self, handleType, names, sender):
"""
For org.freedesktop.telepathy.Connection
+ Overiding telepathy.server.Connecton to allow custom handles
"""
self.check_connected()
self.check_handle_type(handleType)
handles = []
for name in names:
- name = name.encode('utf-8')
+ requestedHandleName = name.encode('utf-8')
if handleType == telepathy.HANDLE_TYPE_CONTACT:
- h = self._create_contact_handle(name)
+ _moduleLogger.info("RequestHandles Contact: %s" % requestedHandleName)
+ requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
+ requestedHandleName
+ )
+ h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
elif handleType == telepathy.HANDLE_TYPE_LIST:
# Support only server side (immutable) lists
- h = handle.create_handle(self, 'list', name)
+ _moduleLogger.info("RequestHandles List: %s" % requestedHandleName)
+ h = handle.create_handle(self, 'list', requestedHandleName)
else:
- raise telepathy.NotAvailable('Handle type unsupported %d' % handleType)
+ raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
handles.append(h.id)
- self.add_client_handle(handle, sender)
+ self.add_client_handle(h, sender)
return handles
- def _create_contact_handle(self, name):
- requestedContactId = name
-
- contacts = self._addressbook.get_contacts()
- contactsFound = [
- contactId for contactId in contacts
- if contactId == requestedContactId
- ]
-
- if 0 < len(contactsFound):
- contactId = contactsFound[0]
- if len(contactsFound) != 1:
- _moduleLogger.error("Contact ID was not unique: %s for %s" % (contactId, ))
- else:
- contactId = requestedContactId
- h = handle.create_handle(self, 'contact', contactId)
+ 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
+
+ @gobject_utils.async
+ @gtk_toolbox.log_exception(_moduleLogger)
+ def _on_conversations_updated(self, conv, conversationIds):
+ # @todo get conversations update running
+ # @todo test conversatiuons
+ _moduleLogger.info("Incoming messages from: %r" % (conversationIds, ))
+ for contactId, phoneNumber in conversationIds:
+ h = handle.create_handle(self, 'contact', contactId, 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)
+ channel = self._channelManager.channel_for_props(props, signal=True)
projects / theonering / blobdiff