Ticket #1681: 0001-sugar.datastore.datastore-replace-naive-listeners-wi.patch

src/sugar/datastore/datastore.py

@@ -40 +40 @@
 DS_DBUS_PATH = "/org/laptop/sugar/DataStore"
 
 _data_store = None
-_data_store_listener = None
 
 
 def _get_data_store():
@@ -51 +50 @@
         _data_store = dbus.Interface(_bus.get_object(DS_DBUS_SERVICE,
                                                      DS_DBUS_PATH),
                                      DS_DBUS_INTERFACE)
-        _data_store.connect_to_signal('Created', __datastore_created_cb)
-        _data_store.connect_to_signal('Deleted', __datastore_deleted_cb)
-        _data_store.connect_to_signal('Updated', __datastore_updated_cb)
 
     return _data_store
 
 
-def __datastore_created_cb(object_id):
-    metadata = _get_data_store().get_properties(object_id, byte_arrays=True)
-    updated.send(None, object_id=object_id, metadata=metadata)
+class DataStoreSignal(dispatch.DbusSignal):
 
+    def __init__(self, signal_name, signal_args):
+        dispatch.DbusSignal.__init__(self, signal_name, signal_args,
+            bus=dbus.SessionBus(), iface_name=DS_DBUS_INTERFACE,
+            service_name=DS_DBUS_SERVICE, path=DS_DBUS_PATH)
+
+
+class CreatedSignal(DataStoreSignal):
+
+    def __init__(self):
+        DataStoreSignal.__init__(self, 'Created', ['metadata', 'object_id'])
+
+    def _relay(self, object_id):
+        # pylint: disable-msg=W0221
+        metadata = _get_data_store().get_properties(object_id,
+            byte_arrays=True)
+        self.send(None, metadata=metadata, object_id=object_id)
 
-def __datastore_updated_cb(object_id):
-    metadata = _get_data_store().get_properties(object_id, byte_arrays=True)
-    updated.send(None, object_id=object_id, metadata=metadata)
 
+class UpdatedSignal(DataStoreSignal):
 
-def __datastore_deleted_cb(object_id):
-    deleted.send(None, object_id=object_id)
+    def __init__(self):
+        DataStoreSignal.__init__(self, 'Updated', ['metadata', 'object_id'])
 
-created = dispatch.Signal()
-deleted = dispatch.Signal()
-updated = dispatch.Signal()
+    def _relay(self, object_id):
+        # pylint: disable-msg=W0221
+        metadata = _get_data_store().get_properties(object_id,
+            byte_arrays=True)
+        self.send(None, metadata=metadata, object_id=object_id)
 
-_get_data_store()
+
+class DeletedSignal(DataStoreSignal):
+
+    def __init__(self):
+        DataStoreSignal.__init__(self, 'Deleted', ['object_id'])
+
+    def _relay(self, object_id):
+        # pylint: disable-msg=W0221
+        self.send(None, object_id=object_id)
 
 
 class DSMetadata(gobject.GObject):
@@ -518 +536 @@
     """
     return _get_data_store().get_uniquevaluesfor(
                                 key, dbus.Dictionary({}, signature='ss'))
+
+
+created = CreatedSignal()
+updated = UpdatedSignal()
+deleted = DeletedSignal()