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

Adapt to datastore API changes.

Browse Source
This commit is contained in:
Tomeu Vizoso 2007-07-13 13:20:44 +02:00
parent 7712dfe31a
commit 91f0eb52aa
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sugar/activity/activity.py
View File

@ -249,7 +249,7 @@ class Activity(Window, gtk.Container):
self._jobject.metadata['title_set_by_user'] = '0' self._jobject.metadata['title_set_by_user'] = '0'
self._jobject.metadata['activity'] = self.get_service_name() self._jobject.metadata['activity'] = self.get_service_name()
self._jobject.metadata['keep'] = '0' self._jobject.metadata['keep'] = '0'
self._jobject.metadata['buddies'] = '' #self._jobject.metadata['buddies'] = ''
self._jobject.metadata['preview'] = '' self._jobject.metadata['preview'] = ''
self._jobject.metadata['icon-color'] = profile.get_color().to_string() self._jobject.metadata['icon-color'] = profile.get_color().to_string()
self._jobject.file_path = '' self._jobject.file_path = ''
@ -339,7 +339,7 @@ class Activity(Window, gtk.Container):
def save(self): def save(self):
"""Request that the activity is saved to the Journal.""" """Request that the activity is saved to the Journal."""
self.metadata['buddies'] = self._get_buddies() #self.metadata['buddies'] = self._get_buddies()
if self._preview is None: if self._preview is None:
self.metadata['preview'] = '' self.metadata['preview'] = ''
else: else:

8
sugar/datastore/datastore.py
View File

@ -16,6 +16,7 @@
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
import logging import logging
import time
import gobject import gobject
@ -129,11 +130,16 @@ def get(object_id):
return ds_object return ds_object
def create(): 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): def write(ds_object, reply_handler=None, error_handler=None):
logging.debug('datastore.write') logging.debug('datastore.write')
ds_object.metadata['mtime'] = time.strftime('%Y-%m-%d')
properties = ds_object.metadata.get_dictionary().copy() properties = ds_object.metadata.get_dictionary().copy()
# The title property should be sent as a 'text' property so it gets indexed # The title property should be sent as a 'text' property so it gets indexed
if properties.has_key('title'): if properties.has_key('title'):

9
sugar/datastore/dbus_helpers.py
View File

@ -15,6 +15,7 @@
# License along with this library; if not, write to the # License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
import logging import logging
import dbus import dbus
@ -34,6 +35,8 @@ _data_store = dbus.Interface(_bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH),
def create(properties, filename): def create(properties, filename):
object_id = _data_store.create(dbus.Dictionary(properties), filename) object_id = _data_store.create(dbus.Dictionary(properties), filename)
logging.debug('dbus_helpers.create: ' + object_id) logging.debug('dbus_helpers.create: ' + object_id)
# TODO: take out this forced flush
_data_store.complete_indexing()
return object_id return object_id
def update(uid, properties, filename, reply_handler=None, error_handler=None): 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) error_handler=error_handler)
else: else:
_data_store.update(uid, dbus.Dictionary(properties), filename) _data_store.update(uid, dbus.Dictionary(properties), filename)
# TODO: take out this forced flush
_data_store.complete_indexing()
def delete(uid): def delete(uid):
logging.debug('dbus_helpers.delete: %r' % uid) logging.debug('dbus_helpers.delete: %r' % uid)
_data_store.delete(uid) _data_store.delete(uid)
# TODO: take out this forced flush
_data_store.complete_indexing()
def get_properties(uid): def get_properties(uid):
logging.debug('dbus_helpers.get_properties: %s' % 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): def get_filename(uid):
filename = _data_store.get_filename(uid) filename = _data_store.get_filename(uid)