Fix file indexing

[netatalk.git] / etc / afpd / spotlight_module.c

diff --git a/etc/afpd/spotlight_module.c b/etc/afpd/spotlight_module.c
index cdc364049ccbb6d48fe4b8a99305f49b9d7923ea..7e6556f93ad93e89ea059f8747ac582fa516fcf8 100644 (file)
--- a/etc/afpd/spotlight_module.c
+++ b/etc/afpd/spotlight_module.c
@@ -33,6 +33,7 @@
 #define MAX_SL_RESULTS 20
 
 static TrackerSparqlConnection *connection;
+static TrackerMinerManager *manager;
 
 char *tracker_to_unix_path(const char *uri)
 {
@@ -71,6 +72,7 @@ static int sl_mod_init(void *p)
 
     become_root();
     connection = tracker_sparql_connection_get(NULL, &error);
+    manager = tracker_miner_manager_new_full(FALSE, &error);
     unbecome_root();
 
     if (!connection) {
@@ -80,6 +82,12 @@ static int sl_mod_init(void *p)
         EC_FAIL;
     }
 
+    if (!manager) {
+        LOG(log_error, logtype_sl, "Couldn't connect to Tracker miner");
+        g_clear_error(&error);
+        EC_FAIL;
+    }
+
 EC_CLEANUP:
     EC_EXIT;
 }
@@ -191,8 +199,10 @@ static int add_filemeta(sl_array_t *reqinfo, sl_array_t *fm_array, cnid_t id, co
     sl_nil_t nil = 0;
     int i, metacount;
 
-    if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0)
-        EC_FAIL;
+    if ((metacount = talloc_array_length(reqinfo->dd_talloc_array)) == 0) {
+        dalloc_add_copy(fm_array, &nil, sl_nil_t);
+        goto EC_CLEANUP;
+    }
 
     LOG(log_debug, logtype_sl, "add_filemeta: metadata count: %d", metacount);
 
@@ -228,8 +238,9 @@ static int sl_mod_fetch_result(void *p)
     sl_cnids_t *cnids;
     sl_filemeta_t *fm;
     sl_array_t *fm_array;
+    sl_nil_t nil;
     uint64_t uint64;
-    gboolean qres;
+    gboolean qres, firstmatch = true;
 
     if (!slq->slq_tracker_cursor) {
         LOG(log_debug, logtype_sl, "sl_mod_fetch_result: no results found");
@@ -247,13 +258,9 @@ static int sl_mod_fetch_result(void *p)
     fm_array = talloc_zero(fm, sl_array_t);
     dalloc_add(fm, fm_array, sl_array_t);
 
-    /* For some reason the list of results always starts with a nil entry */
-    sl_nil_t nil;
-    dalloc_add_copy(fm_array, &nil, sl_nil_t);
-
     LOG(log_debug, logtype_sl, "sl_mod_fetch_result: now interating Tracker results cursor");
 
-    while (i <= MAX_SL_RESULTS) {
+    while ((slq->slq_state == SLQ_STATE_RUNNING) && (i <= MAX_SL_RESULTS)) {
         become_root();
         qres = tracker_sparql_cursor_next(slq->slq_tracker_cursor, NULL, &error);
         unbecome_root();
@@ -261,12 +268,16 @@ static int sl_mod_fetch_result(void *p)
         if (!qres)
             break;
 
+        if (firstmatch) {
+            /* For some reason the list of results always starts with a nil entry */
+            dalloc_add_copy(fm_array, &nil, sl_nil_t);
+            firstmatch = false;
+        }
+
         become_root();
         uri = tracker_sparql_cursor_get_string(slq->slq_tracker_cursor, 0, NULL);
         unbecome_root();
 
-        LOG(log_debug, logtype_sl, "uri: \"%s\"", uri);
-
         EC_NULL_LOG( path = tracker_to_unix_path(uri) );
 
         if ((id = cnid_for_path(slq->slq_vol->v_cdb, slq->slq_vol->v_path, path, &did)) == CNID_INVALID) {
@@ -294,12 +305,14 @@ static int sl_mod_fetch_result(void *p)
     if (i < MAX_SL_RESULTS)
         slq->slq_state = SLQ_STATE_DONE;
 
+    uint64 = (i > 0) ? 35 : 0; /* OS X AFP server returns 35 here if results are found */
+    dalloc_add_copy(slq->slq_reply, &uint64, uint64_t);
     dalloc_add(slq->slq_reply, cnids, sl_cnids_t);
     dalloc_add(slq->slq_reply, fm, sl_filemeta_t);
 
 EC_CLEANUP:
-    if (slq->slq_tracker_cursor) {
-        if ((ret != 0) || (slq->slq_state == SLQ_STATE_DONE)) {
+    if (ret != 0) {
+        if (slq->slq_tracker_cursor) {
             g_object_unref(slq->slq_tracker_cursor);
             slq->slq_tracker_cursor = NULL;
         }
@@ -342,33 +355,29 @@ EC_CLEANUP:
 static int sl_mod_index_file(const void *p)
 {
 #ifdef HAVE_TRACKER_MINER
-    /* hangs in tracker_miner_manager_new_full() for whatever reason... */
-    return 0;
-
     EC_INIT;
     const char *f = p;
 
     if (!f)
         goto EC_CLEANUP;
 
-    TrackerMinerManager *manager;
     GError *error = NULL;
-    GFile *file;
+    GFile *file = NULL;
 
-    if ((manager = tracker_miner_manager_new_full(FALSE, &error)) == NULL) {
-        LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): couldn't connect to Tracker miner", f);
-    } else {
-        file = g_file_new_for_commandline_arg(f);
-        tracker_miner_manager_index_file(manager, file, &error);
-        if (error)
-            LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): indexing failed", f);
-        else
-            LOG(log_debug, logtype_sl, "sl_mod_index_file(\"%s\"): indexing file was successful", f);
-        g_object_unref(manager);
-        g_object_unref(file);
-    }
+    file = g_file_new_for_commandline_arg(f);
+
+    become_root();
+    tracker_miner_manager_index_file(manager, file, &error);
+    unbecome_root();
+
+    if (error)
+        LOG(log_error, logtype_sl, "sl_mod_index_file(\"%s\"): indexing failed", f);
+    else
+        LOG(log_debug, logtype_sl, "sl_mod_index_file(\"%s\"): indexing file was successful", f);
 
 EC_CLEANUP:
+    if (file)
+        g_object_unref(file);
     EC_EXIT;
 #else
     return 0;