X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fchannel%2Fcall.py;h=aefc59861a1cede286d4094bf8fc35101f2ff19d;hb=707c9235445ddf929457e6bb1850b4af6d4702f6;hp=abe820f9df8e841e809372b276bb11166ec105ec;hpb=7b8b1390728940678226c5587ee9918f1dad58cb;p=theonering diff --git a/src/channel/call.py b/src/channel/call.py index abe820f..aefc598 100644 --- a/src/channel/call.py +++ b/src/channel/call.py @@ -1,33 +1,71 @@ import logging +import dbus import telepathy -import gtk_toolbox -import handle +import tp +import util.go_utils as gobject_utils +import util.misc as misc_utils -_moduleLogger = logging.getLogger("channel.call") +_moduleLogger = logging.getLogger(__name__) class CallChannel( - telepathy.server.ChannelTypeStreamedMedia, - telepathy.server.ChannelInterfaceCallState, - telepathy.server.ChannelInterfaceGroup, + tp.ChannelTypeStreamedMedia, + tp.ChannelInterfaceGroup, + tp.ChannelInterfaceCallState, + tp.ChannelInterfaceHold, ): def __init__(self, connection, manager, props, contactHandle): - self._manager = manager - self._props = props + self.__manager = manager + self.__props = props + self._delayedClose = gobject_utils.Timeout(self._on_close_requested) + + if telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle' in props: + self._initiator = connection.get_handle_by_id( + telepathy.HANDLE_TYPE_CONTACT, + props[telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle'], + ) + elif telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorID' in props: + self._initiator = connection.get_handle_by_name( + telepathy.HANDLE_TYPE_CONTACT, + props[telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle'], + ) + else: + # Maemo 5 seems to require InitiatorHandle/InitiatorID to be set + # even though I can't find them in the dbus spec. I think its + # generally safe to assume that its locally initiated if not + # specified. Specially for The One Ring, its always locally + # initiated + _moduleLogger.warning('InitiatorID or InitiatorHandle not set on new channel, assuming locally initiated') + self._initiator = connection.GetSelfHandle() + + tp.ChannelTypeStreamedMedia.__init__(self, connection, manager, props) + tp.ChannelInterfaceGroup.__init__(self) + tp.ChannelInterfaceCallState.__init__(self) + tp.ChannelInterfaceHold.__init__(self) + self.__contactHandle = contactHandle + self.__calledNumber = None - try: - # HACK Older python-telepathy way - telepathy.server.ChannelTypeStreamedMedia.__init__(self, connection, None) - except TypeError: - # HACK Newer python-telepathy way - telepathy.server.ChannelTypeStreamedMedia.__init__(self, connection, manager, props) - telepathy.server.ChannelInterfaceCallState.__init__(self) - telepathy.server.ChannelInterfaceGroup.__init__(self) - self._contactHandle = contactHandle + self._implement_property_get( + telepathy.interfaces.CHANNEL_INTERFACE, + { + 'InitiatorHandle': lambda: dbus.UInt32(self._initiator.id), + 'InitiatorID': lambda: self._initiator.name, + }, + ) + self._add_immutables({ + 'InitiatorHandle': telepathy.interfaces.CHANNEL_INTERFACE, + 'InitiatorID': telepathy.interfaces.CHANNEL_INTERFACE, + }) + self._implement_property_get( + telepathy.interfaces.CHANNEL_INTERFACE_GROUP, + { + 'LocalPendingMembers': lambda: self.GetLocalPendingMembersWithInfo() + }, + ) self._implement_property_get( telepathy.interfaces.CHANNEL_TYPE_STREAMED_MEDIA, { @@ -35,6 +73,18 @@ class CallChannel( "InitialVideo": self.initial_video, }, ) + self._add_immutables({ + 'InitialAudio': telepathy.interfaces.CHANNEL_TYPE_STREAMED_MEDIA, + 'InitialVideo': telepathy.interfaces.CHANNEL_TYPE_STREAMED_MEDIA, + }) + + self.GroupFlagsChanged(0, 0) + added, removed = [self._conn.GetSelfHandle()], [] + localPending, remotePending = [], [contactHandle] + self.MembersChanged( + '', added, removed, localPending, remotePending, + 0, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE + ) def initial_audio(self): return False @@ -42,32 +92,58 @@ class CallChannel( def initial_video(self): return False - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def Close(self): self.close() def close(self): - telepathy.server.ChannelTypeStreamedMedia.Close(self) - if self._manager.channel_exists(self._props): - # HACK Older python-telepathy requires doing this manually - self._manager.remove_channel(self) + _moduleLogger.debug("Closing call") + self._delayedClose.cancel() + + tp.ChannelTypeStreamedMedia.Close(self) self.remove_from_connection() - @gtk_toolbox.log_exception(_moduleLogger) + if self.__calledNumber is not None: + le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._cancel) + le.start() + + @misc_utils.log_exception(_moduleLogger) + def GetLocalPendingMembersWithInfo(self): + info = dbus.Array([], signature="(uuus)") + for member in self._local_pending: + info.append((member, self._handle, 0, '')) + return info + + @misc_utils.log_exception(_moduleLogger) + def AddMembers(self, handles, message): + _moduleLogger.info("Add members %r: %s" % (handles, message)) + for handle in handles: + if handle == int(self.GetSelfHandle()) and self.GetSelfHandle() in self._local_pending: + _moduleLogger.info("Technically the user just accepted the call") + + @misc_utils.log_exception(_moduleLogger) + def RemoveMembers(self, handles, message): + _moduleLogger.info("Remove members (no-op) %r: %s" % (handles, message)) + + @misc_utils.log_exception(_moduleLogger) + def RemoveMembersWithReason(self, handles, message, reason): + _moduleLogger.info("Remove members (no-op) %r: %s (%i)" % (handles, message, reason)) + + @misc_utils.log_exception(_moduleLogger) def ListStreams(self): """ For org.freedesktop.Telepathy.Channel.Type.StreamedMedia """ return () - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RemoveStreams(self, streams): """ For org.freedesktop.Telepathy.Channel.Type.StreamedMedia """ raise telepathy.errors.NotImplemented("Cannot remove a stream") - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RequestStreamDirection(self, stream, streamDirection): """ For org.freedesktop.Telepathy.Channel.Type.StreamedMedia @@ -77,28 +153,59 @@ class CallChannel( _moduleLogger.info("A request was made to change the stream direction") raise telepathy.errors.NotImplemented("Cannot change directions") - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RequestStreams(self, contactId, streamTypes): """ For org.freedesktop.Telepathy.Channel.Type.StreamedMedia @returns [(Stream ID, contact, stream type, stream state, stream direction, pending send flags)] """ - contact = self._conn.handle(telepathy.constants.HANDLE_TYPE_CONTACT, contactId) - assert self._contactHandle == contact, "%r != %r" % (self._contactHandle, contact) - contactId, contactNumber = handle.ContactHandle.from_handle_name(contact.name) + contact = self._conn.get_handle_by_id(telepathy.constants.HANDLE_TYPE_CONTACT, contactId) + assert self.__contactHandle == contact, "%r != %r" % (self.__contactHandle, contact) - self.CallStateChanged(self._contactHandle, telepathy.constants.CHANNEL_CALL_STATE_RINGING) - self._conn.session.backend.call(contactNumber) - self.CallStateChanged(self._contactHandle, telepathy.constants.CHANNEL_CALL_STATE_FORWARDED) + le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._call) + le.start(contact) streamId = 0 - streamState = telepathy.constants.MEDIA_STREAM_STATE_DISCONNECTED + streamState = telepathy.constants.MEDIA_STREAM_STATE_CONNECTED streamDirection = telepathy.constants.MEDIA_STREAM_DIRECTION_BIDIRECTIONAL pendingSendFlags = telepathy.constants.MEDIA_STREAM_PENDING_REMOTE_SEND return [(streamId, contact, streamTypes[0], streamState, streamDirection, pendingSendFlags)] - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) + def _call(self, contact): + contactNumber = contact.phoneNumber + + self.__calledNumber = contactNumber + self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_RINGING) + + try: + result = yield ( + self._conn.session.backend.call, + (contactNumber, ), + {}, + ) + except Exception: + _moduleLogger.exception("While placing call to %s" % (self.__calledNumber, )) + return + + self._delayedClose.start(seconds=0) + self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_FORWARDED) + + @misc_utils.log_exception(_moduleLogger) + def _cancel(self): + _moduleLogger.debug("Cancelling call") + try: + result = yield ( + self._conn.session.backend.cancel, + (self.__calledNumber, ), + {}, + ) + except Exception: + _moduleLogger.exception("While canceling a call to %s" % (self.__calledNumber, )) + return + + @misc_utils.log_exception(_moduleLogger) def GetCallStates(self): """ For org.freedesktop.Telepathy.Channel.Interface.CallState @@ -106,4 +213,34 @@ class CallChannel( Get the current call states for all contacts involved in this call. @returns {Contact: telepathy.constants.CHANNEL_CALL_STATE_*} """ - return {self._contactHandle: telepathy.constants.CHANNEL_CALL_STATE_FORWARDED} + return {self.__contactHandle: telepathy.constants.CHANNEL_CALL_STATE_FORWARDED} + + @misc_utils.log_exception(_moduleLogger) + def GetHoldState(self): + """ + For org.freedesktop.Telepathy.Channel.Interface.Hold + + Get the current hold state + @returns (HoldState, Reason) + """ + return ( + telepathy.constants.LOCAL_HOLD_STATE_UNHELD, + telepathy.constants.LOCAL_HOLD_STATE_REASON_NONE, + ) + + @misc_utils.log_exception(_moduleLogger) + def RequestHold(self, Hold): + """ + For org.freedesktop.Telepathy.Channel.Interface.Hold + """ + if not Hold: + return + _moduleLogger.debug("Closing without cancel to get out of users way") + self.__calledNumber = None + self.close() + + @misc_utils.log_exception(_moduleLogger) + def _on_close_requested(self, *args): + _moduleLogger.debug("Cancel now disallowed") + self.__calledNumber = None + self.close()