Adapt to datastore API changes.
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
import logging
|
||||
import time
|
||||
|
||||
import gobject
|
||||
|
||||
@@ -129,11 +130,16 @@ def get(object_id):
|
||||
return ds_object
|
||||
|
||||
def create():
|
||||
return DSObject(object_id=None, metadata=DSMetadata(), file_path=None)
|
||||
metadata = DSMetadata()
|
||||
metadata['ctime'] = time.strftime('%Y-%m-%d')
|
||||
metadata['mtime'] = metadata['ctime']
|
||||
return DSObject(object_id=None, metadata=metadata, file_path=None)
|
||||
|
||||
def write(ds_object, reply_handler=None, error_handler=None):
|
||||
logging.debug('datastore.write')
|
||||
|
||||
ds_object.metadata['mtime'] = time.strftime('%Y-%m-%d')
|
||||
|
||||
properties = ds_object.metadata.get_dictionary().copy()
|
||||
# The title property should be sent as a 'text' property so it gets indexed
|
||||
if properties.has_key('title'):
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
# License along with this library; if not, write to the
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
import logging
|
||||
|
||||
import dbus
|
||||
@@ -34,6 +35,8 @@ _data_store = dbus.Interface(_bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH),
|
||||
def create(properties, filename):
|
||||
object_id = _data_store.create(dbus.Dictionary(properties), filename)
|
||||
logging.debug('dbus_helpers.create: ' + object_id)
|
||||
# TODO: take out this forced flush
|
||||
_data_store.complete_indexing()
|
||||
return object_id
|
||||
|
||||
def update(uid, properties, filename, reply_handler=None, error_handler=None):
|
||||
@@ -44,14 +47,18 @@ def update(uid, properties, filename, reply_handler=None, error_handler=None):
|
||||
error_handler=error_handler)
|
||||
else:
|
||||
_data_store.update(uid, dbus.Dictionary(properties), filename)
|
||||
# TODO: take out this forced flush
|
||||
_data_store.complete_indexing()
|
||||
|
||||
def delete(uid):
|
||||
logging.debug('dbus_helpers.delete: %r' % uid)
|
||||
_data_store.delete(uid)
|
||||
|
||||
# TODO: take out this forced flush
|
||||
_data_store.complete_indexing()
|
||||
|
||||
def get_properties(uid):
|
||||
logging.debug('dbus_helpers.get_properties: %s' % uid)
|
||||
return _data_store.get_properties(uid, [])
|
||||
return _data_store.get_properties(uid)
|
||||
|
||||
def get_filename(uid):
|
||||
filename = _data_store.get_filename(uid)
|
||||
|
||||
Reference in New Issue
Block a user