Add ctime property to the index and datastore

Signed-off-by: Andrés Ambrois <andresambrois@gmail.com>
Signed-off-by: Michael Stone <michael@laptop.org>

2 files changed, 15 insertions, 2 deletions

diff --git a/datastore/src/carquinyol/datastore.py b/datastore/src/carquinyol/datastore.py
index 5d49e42..28ac800 100644
--- a/datastore/src/carquinyol/datastore.py
+++ b/datastore/src/carquinyol/datastore.py
@@ -131,8 +131,11 @@ class DataStore(dbus.service.Object):
                async_cb, async_err_cb):
         uid = str(uuid.uuid4())
 
+        ctime = int(time.time())
         if not props.get('timestamp', ''):
-            props['timestamp'] = int(time.time())
+            props['timestamp'] = ctime
+        if not props.get('ctime', ''):
+            props['ctime'] = ctime
 
         if os.path.exists(file_path):
             stat = os.stat(file_path)
@@ -168,8 +171,11 @@ class DataStore(dbus.service.Object):
              byte_arrays=True)
     def update(self, uid, props, file_path, transfer_ownership,
                async_cb, async_err_cb):
+        timestamp = int(time.time())
+        if not props.get('ctime', ''):
+            props['ctime'] = props.get('timestamp', timestamp)
         if not props.get('timestamp', ''):
-            props['timestamp'] = int(time.time())
+            props['timestamp'] = timestamp
 
         if os.path.exists(file_path):
             stat = os.stat(file_path)
diff --git a/datastore/src/carquinyol/indexstore.py b/datastore/src/carquinyol/indexstore.py
index 8223301..88d12d5 100644
--- a/datastore/src/carquinyol/indexstore.py
+++ b/datastore/src/carquinyol/indexstore.py
@@ -60,6 +60,7 @@ _QUERY_TERM_MAP = {
 _QUERY_VALUE_MAP = {
     'timestamp': {'number': _VALUE_TIMESTAMP, 'type': float},
     'filesize': {'number': _VALUE_FILESIZE, 'type': int},
+    'ctime': {'number': _VALUE_CTIME, 'type': int},
 }
 
 
@@ -71,6 +72,8 @@ class TermGenerator (xapian.TermGenerator):
         document.add_value(_VALUE_TITLE, properties.get('title', '').strip())
         document.add_value(_VALUE_FILESIZE,
             xapian.sortable_serialise(int(properties['filesize'])))
+        document.add_value(_VALUE_CTIME,
+            xapian.sortable_serialise(int(properties['ctime'])))
 
         self.set_document(document)
 
@@ -283,6 +286,10 @@ class IndexStore(object):
             enquire.set_sort_by_value(_VALUE_TIMESTAMP, True)
         elif order_by == '-timestamp':
             enquire.set_sort_by_value(_VALUE_TIMESTAMP, False)
+        elif order_by == '+ctime':
+            enquire.set_sort_by_value(_VALUE_CTIME, True)
+        elif order_by == '-ctime':
+            enquire.set_sort_by_value(_VALUE_CTIME, False)
         elif order_by == '+title':
             enquire.set_sort_by_value(_VALUE_TITLE, True)
         elif order_by == '-title':