diff options
Diffstat (limited to 'src/sugar/datastore/datastore.py')
| -rw-r--r-- | src/sugar/datastore/datastore.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/sugar/datastore/datastore.py b/src/sugar/datastore/datastore.py index 87eedd2..74806e5 100644 --- a/src/sugar/datastore/datastore.py +++ b/src/sugar/datastore/datastore.py @@ -42,7 +42,7 @@ class DSMetadata(gobject.GObject): else: self._props = props - default_keys = ['activity', 'activity_id', + default_keys = ['bundle_id', 'activity_id', 'mime_type', 'title_set_by_user'] for key in default_keys: if not self._props.has_key(key): @@ -81,8 +81,8 @@ class DSMetadata(gobject.GObject): return default class DSObject(object): - def __init__(self, object_id, version_id, metadata=None, file_path=None): - self.object_id = object_id + def __init__(self, tree_id, version_id, metadata=None, file_path=None): + self.tree_id = tree_id self.version_id = version_id self._metadata = metadata self._file_path = file_path @@ -90,8 +90,8 @@ class DSObject(object): self._owns_file = False def get_metadata(self): - if self._metadata is None and not self.object_id is None: - metadata = DSMetadata(dbus_helpers.get_properties(self.object_id, self.version_id)) + if self._metadata is None and not self.tree_id is None: + metadata = DSMetadata(dbus_helpers.get_properties(self.tree_id, self.version_id)) self._metadata = metadata return self._metadata @@ -102,8 +102,8 @@ class DSObject(object): metadata = property(get_metadata, set_metadata) def get_file_path(self, fetch=True): - if fetch and self._file_path is None and not self.object_id is None: - self.set_file_path(dbus_helpers.get_filename(self.object_id, self.version_id)) + if fetch and self._file_path is None and not self.tree_id is None: + self.set_file_path(dbus_helpers.get_filename(self.tree_id, self.version_id)) self._owns_file = True return self._file_path @@ -137,11 +137,11 @@ class DSObject(object): def copy(self): return DSObject(None, self._metadata.copy(), self._file_path) -def get(object_id, version_id): +def get(tree_id, version_id): logging.debug('datastore.get') - metadata = dbus_helpers.get_properties(object_id, version_id) + metadata = dbus_helpers.get_properties(tree_id, version_id) - ds_object = DSObject(object_id, version_id, DSMetadata(metadata), None) + ds_object = DSObject(tree_id, version_id, DSMetadata(metadata), None) # TODO: register the object for updates return ds_object @@ -149,7 +149,7 @@ def create(): metadata = DSMetadata() metadata['mtime'] = datetime.now().isoformat() metadata['timestamp'] = int(time.time()) - return DSObject(object_id=None, version_id=None, metadata=metadata, file_path=None) + return DSObject(tree_id=None, version_id=None, metadata=metadata, file_path=None) def write(ds_object, update_mtime=True, transfer_ownership=False, reply_handler=None, error_handler=None, timeout=-1): @@ -167,8 +167,8 @@ def write(ds_object, update_mtime=True, transfer_ownership=False, # FIXME: this func will be sync for creates regardless of the handlers # supplied. This is very bad API, need to decide what to do here. - if ds_object.object_id: - dbus_helpers.update(ds_object.object_id, ds_object.version_id, + if ds_object.tree_id: + dbus_helpers.update(ds_object.tree_id, ds_object.version_id, properties, file_path, transfer_ownership, @@ -179,17 +179,17 @@ def write(ds_object, update_mtime=True, transfer_ownership=False, if reply_handler or error_handler: logging.warning('datastore.write() cannot currently be called' \ 'async for creates, see ticket 3071') - (ds_object.object_id, ds_object.version_id) = dbus_helpers.create(properties, + (ds_object.tree_id, ds_object.version_id) = dbus_helpers.create(properties, file_path, transfer_ownership) - ds_object.metadata['uid'] = ds_object.object_id - ds_object.metadata['vid'] = ds_object.version_id + ds_object.metadata['tree_id'] = ds_object.tree_id + ds_object.metadata['version_id'] = ds_object.version_id # TODO: register the object for updates - logging.debug('Written object (%s,%s) to the datastore.' % (ds_object.object_id, ds_object.version_id)) + logging.debug('Written object (%s,%s) to the datastore.' % (ds_object.tree_id, ds_object.version_id)) -def delete(object_id, version_id): +def delete(tree_id, version_id): logging.debug('datastore.delete') - dbus_helpers.delete(object_id, version_id) + dbus_helpers.delete(tree_id, version_id) def find(query, sorting=None, limit=None, offset=None, properties=None, reply_handler=None, error_handler=None): @@ -211,12 +211,12 @@ def find(query, sorting=None, limit=None, offset=None, properties=None, objects = [] for props in props_list: - object_id = props['uid'] - version_id = props['vid'] - del props['uid'] - del props['vid'] + tree_id = props['tree_id'] + version_id = props['version_id'] + del props['tree_id'] + del props['version_id'] - ds_object = DSObject(object_id, version_id, DSMetadata(props), None) + ds_object = DSObject(tree_id, version_id, DSMetadata(props), None) objects.append(ds_object) return objects, total_count |