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

Make Service a GObject subclass, and add a property-changed signal

Browse Source 
Also fix bug where all property keys were sent in the property-changed signal
because the properties dict was cleared too early.
This commit is contained in:
Dan Williams 2006-09-22 15:44:25 -04:00
parent c978b5ed6d
commit 1ab8089457
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
services/presence/Service.py
View File

@ -5,6 +5,7 @@ from sugar import util
import dbus, dbus.service import dbus, dbus.service
import random import random
import logging import logging
import gobject
def compose_service_name(name, activity_id): def compose_service_name(name, activity_id):
if type(name) == type(""): if type(name) == type(""):
@ -135,13 +136,19 @@ class ServiceDBusHelper(dbus.service.Object):
self._parent.set_properties(values, sender) self._parent.set_properties(values, sender)
class Service(object): class Service(gobject.GObject):
"""Encapsulates information about a specific ZeroConf/mDNS """Encapsulates information about a specific ZeroConf/mDNS
service as advertised on the network.""" service as advertised on the network."""
__gsignals__ = {
'property-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([gobject.TYPE_PYOBJECT]))
}
def __init__(self, bus_name, object_id, name, stype, domain=u"local", def __init__(self, bus_name, object_id, name, stype, domain=u"local",
address=None, port=-1, properties=None, source_address=None, address=None, port=-1, properties=None, source_address=None,
local_publisher=None): local_publisher=None):
gobject.GObject.__init__(self)
if not bus_name: if not bus_name:
raise ValueError("DBus bus name must be valid") raise ValueError("DBus bus name must be valid")
if not object_id or type(object_id) != type(1): if not object_id or type(object_id) != type(1):
@ -178,7 +185,7 @@ class Service(object):
self._domain = domain self._domain = domain
self._port = -1 self._port = -1
self.set_port(port) self.set_port(port)
self._properties = None self._properties = {}
self._dbus_helper = None self._dbus_helper = None
self._internal_set_properties(properties) self._internal_set_properties(properties)
@ -252,6 +259,11 @@ class Service(object):
properties.""" properties."""
return self._properties return self._properties
def __emit_properties_changed_signal(self, keys):
if self._dbus_helper:
self._dbus_helper.PublishedValueChanged(keys)
self.emit('property-changed', keys)
def set_property(self, key, value, sender=None): def set_property(self, key, value, sender=None):
"""Set one service property""" """Set one service property"""
if not self._local_publisher: if not self._local_publisher:
@ -290,8 +302,7 @@ class Service(object):
if self._local_publisher and self._avahi_entry_group: if self._local_publisher and self._avahi_entry_group:
self.__internal_update_avahi_properties() self.__internal_update_avahi_properties()
if self._dbus_helper: self.__emit_properties_changed_signal([key])
self._dbus_helper.PublishedValueChanged([key])
def set_properties(self, properties, sender=None, from_network=False): def set_properties(self, properties, sender=None, from_network=False):
"""Set all service properties in one call""" """Set all service properties in one call"""
@ -306,13 +317,13 @@ class Service(object):
python dictionary.""" python dictionary."""
if type(properties) != type({}): if type(properties) != type({}):
raise ValueError("Properties must be a dictionary.") raise ValueError("Properties must be a dictionary.")
self._properties = {}
# Make sure the properties are actually different # Make sure the properties are actually different
diff_keys = _dicts_differ(self._properties, properties) diff_keys = _dicts_differ(self._properties, properties)
if len(diff_keys) == 0: if len(diff_keys) == 0:
return return
self._properties = {}
# Set key/value pairs on internal property list # Set key/value pairs on internal property list
for key, value in properties.items(): for key, value in properties.items():
if len(key) == 0: if len(key) == 0:
@ -329,8 +340,7 @@ class Service(object):
if self._local_publisher and self._avahi_entry_group and not from_network: if self._local_publisher and self._avahi_entry_group and not from_network:
self.__internal_update_avahi_properties() self.__internal_update_avahi_properties()
if self._dbus_helper: self.__emit_properties_changed_signal(diff_keys)
self._dbus_helper.PublishedValueChanged(diff_keys)
def __internal_update_avahi_properties(self): def __internal_update_avahi_properties(self):
info = _convert_properties_to_dbus_byte_array(self._properties) info = _convert_properties_to_dbus_byte_array(self._properties)