X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fchannel%2Fcall.py;h=aefc59861a1cede286d4094bf8fc35101f2ff19d;hb=a471c16a9c4de121b731505af4d0db1a07521ace;hp=5ab9a0b4b68c104c43f3372ace98dd4a023faaa5;hpb=c031c65923a021324ae3e9077332a9b3d43c716c;p=theonering diff --git a/src/channel/call.py b/src/channel/call.py index 5ab9a0b..aefc598 100644 --- a/src/channel/call.py +++ b/src/channel/call.py @@ -1,26 +1,27 @@ import logging import dbus -import gobject import telepathy import tp -import gtk_toolbox +import util.go_utils as gobject_utils +import util.misc as misc_utils -_moduleLogger = logging.getLogger("channel.call") +_moduleLogger = logging.getLogger(__name__) class CallChannel( tp.ChannelTypeStreamedMedia, - tp.ChannelInterfaceCallState, tp.ChannelInterfaceGroup, + tp.ChannelInterfaceCallState, + tp.ChannelInterfaceHold, ): def __init__(self, connection, manager, props, contactHandle): self.__manager = manager self.__props = props - self.__cancelId = None + self._delayedClose = gobject_utils.Timeout(self._on_close_requested) if telepathy.interfaces.CHANNEL_INTERFACE + '.InitiatorHandle' in props: self._initiator = connection.get_handle_by_id( @@ -42,9 +43,11 @@ class CallChannel( self._initiator = connection.GetSelfHandle() tp.ChannelTypeStreamedMedia.__init__(self, connection, manager, props) - tp.ChannelInterfaceCallState.__init__(self) tp.ChannelInterfaceGroup.__init__(self) + tp.ChannelInterfaceCallState.__init__(self) + tp.ChannelInterfaceHold.__init__(self) self.__contactHandle = contactHandle + self.__calledNumber = None self._implement_property_get( telepathy.interfaces.CHANNEL_INTERFACE, @@ -76,8 +79,10 @@ class CallChannel( }) self.GroupFlagsChanged(0, 0) + added, removed = [self._conn.GetSelfHandle()], [] + localPending, remotePending = [], [contactHandle] self.MembersChanged( - '', [self._conn.GetSelfHandle()], [], [], [contactHandle], + '', added, removed, localPending, remotePending, 0, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE ) @@ -87,55 +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): _moduleLogger.debug("Closing call") + self._delayedClose.cancel() + tp.ChannelTypeStreamedMedia.Close(self) self.remove_from_connection() - if self.__cancelId is not None: - gobject.source_remove(self.__cancelId) - self.__cancelId = None - @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 - @gtk_toolbox.log_exception(_moduleLogger) + @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") - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RemoveMembers(self, handles, message): _moduleLogger.info("Remove members (no-op) %r: %s" % (handles, message)) - @gtk_toolbox.log_exception(_moduleLogger) + @misc_utils.log_exception(_moduleLogger) def RemoveMembersWithReason(self, handles, message, reason): _moduleLogger.info("Remove members (no-op) %r: %s (%i)" % (handles, message, reason)) - @gtk_toolbox.log_exception(_moduleLogger) + @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 @@ -145,7 +153,7 @@ 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 @@ -154,11 +162,9 @@ class CallChannel( """ contact = self._conn.get_handle_by_id(telepathy.constants.HANDLE_TYPE_CONTACT, contactId) assert self.__contactHandle == contact, "%r != %r" % (self.__contactHandle, contact) - contactNumber = contact.phoneNumber - self.CallStateChanged(self.__contactHandle, telepathy.constants.CHANNEL_CALL_STATE_RINGING) - self.__cancelId = gobject.idle_add(self._on_cancel) - self._conn.session.backend.call(contactNumber) + le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._call) + le.start(contact) streamId = 0 streamState = telepathy.constants.MEDIA_STREAM_STATE_CONNECTED @@ -166,7 +172,40 @@ class CallChannel( 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 @@ -176,9 +215,32 @@ class CallChannel( """ return {self.__contactHandle: telepathy.constants.CHANNEL_CALL_STATE_FORWARDED} - @gtk_toolbox.log_exception(_moduleLogger) - def _on_cancel(self, *args): - self.CallStateChanged(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() - self.__cancelId = None - return False