Ticket #1160: 0001-add-API-to-check-wait-for-index-rebuild-to-finish.patch

src/carquinyol/datastore.py

@@ -50 +50 @@
     """
 
     def __init__(self, **options):
+        self._wait_ready_queue = []
         bus_name = dbus.service.BusName(DS_SERVICE,
                                         bus=dbus.SessionBus(),
                                         replace_existing=False,
@@ -109 +110 @@
         if not uids:
             logging.debug('Finished updating index.')
             layoutmanager.get_instance().index_updated = True
+            self.Ready()
+            for callback in self._wait_ready_queue:
+                callback()
+
+            self._wait_ready_queue = []
             return False
         else:
             return True
@@ -342 +348 @@
     @dbus.service.signal(DS_DBUS_INTERFACE, signature="a{sv}")
     def Unmounted(self, descriptor):
         pass
+
+    @dbus.service.method(DS_DBUS_INTERFACE,
+                         in_signature='',
+                         out_signature='b')
+    def check_ready(self):
+        """Check whether datastore is ready for processing (regular) API
+        calls.
+
+        Return True if datastore is fully operational.
+        """
+        return layoutmanager.get_instance().index_updated
+
+    @dbus.service.method(DS_DBUS_INTERFACE,
+             in_signature='',
+             out_signature='',
+             async_callbacks=('async_cb', 'async_err_cb'))
+    def wait_ready(self, async_cb, async_err_cb):
+        """Block until the datastore is ready for processing (regular) API
+        calls.
+        """
+        if layoutmanager.get_instance().index_updated:
+            async_cb()
+            return
+
+        self._wait_ready_queue.append(async_cb)
+
+    @dbus.service.signal(DS_DBUS_INTERFACE, signature='')
+    def Ready(self):
+        """Signal emitted after datastore is ready for processing API calls.
+        """
+        pass