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

Added object update to the datastore.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-03-04 11:27:33 +01:00
parent 559d21d4d2
commit a585221b16
2 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
services/datastore/datastore.py
View File

@ -111,6 +111,12 @@ class DataStoreDBusHelper(dbus.service.Object):
uid = self._parent.create(prop_dict)
return _create_op(uid)
@dbus.service.method(_DS_DBUS_INTERFACE,
in_signature="ia{sv}", out_signature="o")
def update(self, uid, prop_dict):
self._parent.update(uid, prop_dict)
return _create_op(uid)
@dbus.service.method(_DS_DBUS_INTERFACE,
in_signature="o", out_signature="i")
def delete(self, op):
@ -285,7 +291,7 @@ class DataStore(object):
del curs
return uids
def set_data(self, uid, data):
def update(self, uid, prop_dict):
curs = self._dbcx.cursor()
curs.execute('SELECT uid FROM objects WHERE uid=?;', (uid,))
res = curs.fetchall()
@ -293,26 +299,6 @@ class DataStore(object):
if len(res) <= 0:
del curs
raise NotFoundError("Object %d was not found." % uid)
data = _get_data_as_string(data)
curs.execute("UPDATE objects SET data=? WHERE uid=?;", (data, uid))
self._dbcx.commit()
del curs
self._dbus_obj_helper.Updated(True, {}, False, uid=uid)
_reserved_keys = ["handle", "objid", "data", "created", "modified",
"object-type", "file-path"]
def set_properties(self, uid, prop_dict):
curs = self._dbcx.cursor()
curs.execute('SELECT uid FROM objects WHERE uid=?;', (uid,))
res = curs.fetchall()
self._dbcx.commit()
if len(res) <= 0:
del curs
raise NotFoundError("Object %d was not found." % uid)
for key in prop_dict.keys():
if key in self._reserved_keys:
raise ValueError("key %s is a reserved key." % key)
for (key, value) in prop_dict.items():
value = _get_data_as_string(value)
@ -329,17 +315,6 @@ class DataStore(object):
del curs
self._dbus_obj_helper.Updated(False, {}, False, uid=uid)
def get_data(self, uid):
curs = self._dbcx.cursor()
curs.execute('SELECT uid, data FROM objects WHERE uid=?;', (uid,))
res = curs.fetchall()
self._dbcx.commit()
if len(res) <= 0:
raise NotFoundError("Object %d was not found." % uid)
data = res[0][1]
del curs
return data
def get_properties(self, uid, keys):
query = "SELECT objid, key, value FROM properties WHERE (objid=%d" % uid
subquery = ""

12
sugar/datastore/datastore.py
View File

@ -91,10 +91,14 @@ def write(obj):
metadata = obj.get_metadata().copy()
metadata['file-path'] = obj.get_file_path()
metadata['object-type'] = obj.get_object_type()
logging.debug(str(metadata))
object_path = _data_store.create(dbus.Dictionary(metadata))
dbus_object = _bus.get_object(DS_DBUS_SERVICE, object_path)
return dbus_object.get_properties(['handle'])['handle']
if obj.get_handle():
_data_store.update(int(obj.get_handle()), dbus.Dictionary(metadata))
return obj.get_handle()
else:
object_path = _data_store.create(dbus.Dictionary(metadata))
dbus_object = _bus.get_object(DS_DBUS_SERVICE, object_path)
return dbus_object.get_properties(['handle'])['handle']
def find(query):
object_paths = _data_store.find(query)