diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py
index d174bd4..6ff10de 100644
a
|
b
|
import tempfile |
27 | 27 | import gobject |
28 | 28 | import gconf |
29 | 29 | import gio |
| 30 | import dbus |
30 | 31 | |
31 | 32 | from sugar import env |
32 | 33 | from sugar.datastore import dbus_helpers |
33 | 34 | from sugar import mime |
34 | 35 | |
| 36 | DS_DBUS_SERVICE = "org.laptop.sugar.DataStore" |
| 37 | DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore" |
| 38 | DS_DBUS_PATH = "/org/laptop/sugar/DataStore" |
| 39 | |
| 40 | _data_store = None |
| 41 | |
| 42 | def _get_data_store(): |
| 43 | global _data_store |
| 44 | |
| 45 | if not _data_store: |
| 46 | _bus = dbus.SessionBus() |
| 47 | _data_store = dbus.Interface(_bus.get_object(DS_DBUS_SERVICE, |
| 48 | DS_DBUS_PATH), |
| 49 | DS_DBUS_INTERFACE) |
| 50 | return _data_store |
| 51 | |
| 52 | |
35 | 53 | class DSMetadata(gobject.GObject): |
36 | 54 | __gsignals__ = { |
37 | 55 | 'updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, |
… |
… |
class DSMetadata(gobject.GObject): |
83 | 101 | else: |
84 | 102 | return default |
85 | 103 | |
| 104 | def update(self, properties): |
| 105 | """Update all of the metadata""" |
| 106 | for (key, value) in properties.items(): |
| 107 | self[key] = value |
| 108 | |
| 109 | |
86 | 110 | class DSObject(object): |
87 | 111 | def __init__(self, object_id, metadata=None, file_path=None): |
88 | | self.object_id = object_id |
| 112 | self.set_object_id(object_id) |
89 | 113 | self._metadata = metadata |
90 | 114 | self._file_path = file_path |
91 | 115 | self._destroyed = False |
92 | 116 | self._owns_file = False |
| 117 | self._update_signal_match = None |
| 118 | |
| 119 | def get_object_id(self): |
| 120 | return self._object_id |
| 121 | |
| 122 | def set_object_id(self, object_id): |
| 123 | if object_id is not None: |
| 124 | if self._update_signal_match is not None: |
| 125 | self._update_signal_match.remove() |
| 126 | self._update_signal_match = _get_data_store().connect_to_signal( \ |
| 127 | 'Updated', self.__object_updated_cb, arg0=object_id) |
| 128 | |
| 129 | self._object_id = object_id |
| 130 | |
| 131 | object_id = property(get_object_id, set_object_id) |
| 132 | |
| 133 | def __object_updated_cb(self, object_id): |
| 134 | properties = _get_data_store().get_properties(self.object_id, |
| 135 | byte_arrays=True) |
| 136 | self._metadata.update(properties) |
93 | 137 | |
94 | 138 | def get_metadata(self): |
95 | 139 | if self._metadata is None and not self.object_id is None: |