sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services/presence/presenceservice: various cosmetic cleanups

Browse Source 
* wrap long lines at 80 characters
* don't preformat log messages, let the logging framework do it
* eradicate trailing whitespace
This commit is contained in:
Simon McVittie 2007-05-24 11:34:48 +01:00
parent 55c0d9cb07
commit 1026fce013
1 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
services/presence/presenceservice.py
View File

@ -25,9 +25,10 @@ import dbus.glib
from telepathy.client import ManagerRegistry, Connection from telepathy.client import ManagerRegistry, Connection
from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE) from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE)
from telepathy.constants import (CONNECTION_STATUS_CONNECTING, CONNECTION_STATUS_CONNECTED, from telepathy.constants import (CONNECTION_STATUS_CONNECTING,
CONNECTION_STATUS_DISCONNECTED, CONNECTION_HANDLE_TYPE_CONTACT) CONNECTION_STATUS_CONNECTED,
CONNECTION_STATUS_DISCONNECTED)
from server_plugin import ServerPlugin from server_plugin import ServerPlugin
from linklocal_plugin import LinkLocalPlugin from linklocal_plugin import LinkLocalPlugin
from sugar import util from sugar import util
@ -89,11 +90,16 @@ class PresenceService(ExportedGObject):
self._server_plugin.connect('contact-online', self._contact_online) self._server_plugin.connect('contact-online', self._contact_online)
self._server_plugin.connect('contact-offline', self._contact_offline) self._server_plugin.connect('contact-offline', self._contact_offline)
self._server_plugin.connect('avatar-updated', self._avatar_updated) self._server_plugin.connect('avatar-updated', self._avatar_updated)
self._server_plugin.connect('buddy-properties-changed', self._buddy_properties_changed) self._server_plugin.connect('buddy-properties-changed',
self._server_plugin.connect('buddy-activities-changed', self._buddy_activities_changed) self._buddy_properties_changed)
self._server_plugin.connect('activity-invitation', self._activity_invitation) self._server_plugin.connect('buddy-activities-changed',
self._server_plugin.connect('private-invitation', self._private_invitation) self._buddy_activities_changed)
self._server_plugin.connect('activity-properties-changed', self._activity_properties_changed) self._server_plugin.connect('activity-invitation',
self._activity_invitation)
self._server_plugin.connect('private-invitation',
self._private_invitation)
self._server_plugin.connect('activity-properties-changed',
self._activity_properties_changed)
self._server_plugin.start() self._server_plugin.start()
# Set up the link local connection # Set up the link local connection
@ -145,15 +151,18 @@ class PresenceService(ExportedGObject):
def _buddy_validity_changed_cb(self, buddy, valid): def _buddy_validity_changed_cb(self, buddy, valid):
if valid: if valid:
self.BuddyAppeared(buddy.object_path()) self.BuddyAppeared(buddy.object_path())
_logger.debug("New Buddy: %s (%s)" % (buddy.props.nick, buddy.props.color)) _logger.debug("New Buddy: %s (%s)", buddy.props.nick,
buddy.props.color)
else: else:
self.BuddyDisappeared(buddy.object_path()) self.BuddyDisappeared(buddy.object_path())
_logger.debug("Buddy left: %s (%s)" % (buddy.props.nick, buddy.props.color)) _logger.debug("Buddy left: %s (%s)", buddy.props.nick,
buddy.props.color)
def _buddy_disappeared_cb(self, buddy): def _buddy_disappeared_cb(self, buddy):
if buddy.props.valid: if buddy.props.valid:
self.BuddyDisappeared(buddy.object_path()) self.BuddyDisappeared(buddy.object_path())
_logger.debug('Buddy left: %s (%s)' % (buddy.props.nick, buddy.props.color) _logger.debug('Buddy left: %s (%s)', buddy.props.nick,
buddy.props.color)
self._buddies.pop(buddy.props.key) self._buddies.pop(buddy.props.key)
def _contact_offline(self, tp, handle): def _contact_offline(self, tp, handle):
@ -181,17 +190,20 @@ class PresenceService(ExportedGObject):
buddy = self._handles_buddies[tp].get(handle) buddy = self._handles_buddies[tp].get(handle)
if buddy: if buddy:
buddy.set_properties(properties) buddy.set_properties(properties)
_logger.debug("Buddy %s properties updated: %s" % (buddy.props.nick, properties.keys())) _logger.debug("Buddy %s properties updated: %s", buddy.props.nick,
properties.keys()))
def _new_activity(self, activity_id, tp): def _new_activity(self, activity_id, tp):
try: try:
objid = self._get_next_object_id() objid = self._get_next_object_id()
activity = Activity(self._bus_name, objid, tp, id=activity_id) activity = Activity(self._bus_name, objid, tp, id=activity_id)
except Exception, e: except Exception:
_logger.debug("Invalid activity: %s" % e) # FIXME: catching bare Exception considered harmful
_logger.debug("Invalid activity:", exc_info=1)
return None return None
activity.connect("validity-changed", self._activity_validity_changed_cb) activity.connect("validity-changed",
self._activity_validity_changed_cb)
self._activities[activity_id] = activity self._activities[activity_id] = activity
return activity return activity
@ -200,18 +212,18 @@ class PresenceService(ExportedGObject):
self.ActivityDisappeared(activity.object_path()) self.ActivityDisappeared(activity.object_path())
del self._activities[activity.props.id] del self._activities[activity.props.id]
def _buddy_activities_changed(self, tp, contact_handle, activities): def _buddy_activities_changed(self, tp, contact_handle, activities):
acts = [] acts = []
for act in activities: for act in activities:
acts.append(str(act)) acts.append(str(act))
_logger.debug("Handle %s activities changed: %s" % (contact_handle, acts)) _logger.debug("Handle %s activities changed: %s", contact_handle, acts)
buddies = self._handles_buddies[tp] buddies = self._handles_buddies[tp]
buddy = buddies.get(contact_handle) buddy = buddies.get(contact_handle)
if not buddy: if not buddy:
# We don't know this buddy # We don't know this buddy
# FIXME: What should we do here? # FIXME: What should we do here?
# FIXME: Do we need to check if the buddy is valid or something? # FIXME: Do we need to check if the buddy is valid or something?
_logger.debug("contact_activities_changed: buddy unknown") _logger.debug("contact_activities_changed: buddy unknown")
return return
@ -224,7 +236,7 @@ class PresenceService(ExportedGObject):
activities_joined = new_activities - old_activities activities_joined = new_activities - old_activities
for act in activities_joined: for act in activities_joined:
_logger.debug("Handle %s joined activity %s" % (contact_handle, act)) _logger.debug("Handle %s joined activity %s", contact_handle, act)
activity = self._activities.get(act) activity = self._activities.get(act)
if not activity: if not activity:
# new activity, can fail # new activity, can fail
@ -236,11 +248,11 @@ class PresenceService(ExportedGObject):
activities_left = old_activities - new_activities activities_left = old_activities - new_activities
for act in activities_left: for act in activities_left:
_logger.debug("Handle %s left activity %s" % (contact_handle, act)) _logger.debug("Handle %s left activity %s", contact_handle, act)
activity = self._activities.get(act) activity = self._activities.get(act)
if not activity: if not activity:
continue continue
activity.buddy_left(buddy) activity.buddy_left(buddy)
buddy.remove_activity(activity) buddy.remove_activity(activity)
@ -254,7 +266,8 @@ class PresenceService(ExportedGObject):
def _private_invitation(self, tp, chan_path): def _private_invitation(self, tp, chan_path):
conn = tp.get_connection() conn = tp.get_connection()
self.PrivateInvitation(str(conn.service_name), conn.object_path, chan_path) self.PrivateInvitation(str(conn.service_name), conn.object_path,
chan_path)
@dbus.service.signal(_PRESENCE_INTERFACE, signature="o") @dbus.service.signal(_PRESENCE_INTERFACE, signature="o")
def ActivityAppeared(self, activity): def ActivityAppeared(self, activity):
@ -288,7 +301,8 @@ class PresenceService(ExportedGObject):
ret.append(act.object_path()) ret.append(act.object_path())
return ret return ret
@dbus.service.method(_PRESENCE_INTERFACE, in_signature="s", out_signature="o") @dbus.service.method(_PRESENCE_INTERFACE, in_signature="s",
out_signature="o")
def GetActivityById(self, actid): def GetActivityById(self, actid):
act = self.internal_get_activity(actid) act = self.internal_get_activity(actid)
if not act or not act.props.valid: if not act or not act.props.valid:
@ -358,8 +372,10 @@ class PresenceService(ExportedGObject):
@dbus.service.method(_PRESENCE_INTERFACE, in_signature="sssa{sv}", @dbus.service.method(_PRESENCE_INTERFACE, in_signature="sssa{sv}",
out_signature="o", async_callbacks=('async_cb', 'async_err_cb')) out_signature="o", async_callbacks=('async_cb', 'async_err_cb'))
def ShareActivity(self, actid, atype, name, properties, async_cb, async_err_cb): def ShareActivity(self, actid, atype, name, properties, async_cb,
self._share_activity(actid, atype, name, properties, (async_cb, async_err_cb)) async_err_cb):
self._share_activity(actid, atype, name, properties,
(async_cb, async_err_cb))
@dbus.service.method(_PRESENCE_INTERFACE, out_signature="so") @dbus.service.method(_PRESENCE_INTERFACE, out_signature="so")
def GetPreferredConnection(self): def GetPreferredConnection(self):
@ -375,8 +391,10 @@ class PresenceService(ExportedGObject):
# FIXME check which tp client we should use to share the activity # FIXME check which tp client we should use to share the activity
color = self._owner.props.color color = self._owner.props.color
activity = Activity(self._bus_name, objid, self._server_plugin, activity = Activity(self._bus_name, objid, self._server_plugin,
id=actid, type=atype, name=name, color=color, local=True) id=actid, type=atype, name=name, color=color,
activity.connect("validity-changed", self._activity_validity_changed_cb) local=True)
activity.connect("validity-changed",
self._activity_validity_changed_cb)
self._activities[actid] = activity self._activities[actid] = activity
activity._share(callbacks, self._owner) activity._share(callbacks, self._owner)
@ -389,10 +407,12 @@ class PresenceService(ExportedGObject):
def _activity_validity_changed_cb(self, activity, valid): def _activity_validity_changed_cb(self, activity, valid):
if valid: if valid:
self.ActivityAppeared(activity.object_path()) self.ActivityAppeared(activity.object_path())
_logger.debug("New Activity: %s (%s)" % (activity.props.name, activity.props.id)) _logger.debug("New Activity: %s (%s)", activity.props.name,
activity.props.id))
else: else:
self.ActivityDisappeared(activity.object_path()) self.ActivityDisappeared(activity.object_path())
_logger.debug("Activity disappeared: %s (%s)" % (activity.props.name, activity.props.id)) _logger.debug("Activity disappeared: %s (%s)", activity.props.name,
activity.props.id))
def _activity_properties_changed(self, tp, act_id, props): def _activity_properties_changed(self, tp, act_id, props):
activity = self._activities.get(act_id) activity = self._activities.get(act_id)