[tracker/tracker-0.12] libtracker-miner: don't put sparql for missing/cancelled files

[Martyn James Russell <mr src gnome org>]

commit e2974c1fe6c3fddd708b2216dbaafbcdeb61d3ac
Author: Carlos Garnacho <carlos lanedo com>
Date:   Mon Dec 19 11:37:31 2011 +0100

    libtracker-miner: don't put sparql for missing/cancelled files
    
    This behavior is analogous to 0.10. The miner has to allow lesser
    errors and insert minimal sparql for the files, but this kind of
    errors must not trigger sparql insertion.

 src/libtracker-miner/tracker-miner-fs.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 28c22ee..5e0edeb 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1894,7 +1894,7 @@ item_add_or_update_cb (TrackerMinerFS *fs,
                        const GError   *error)
 {
 	UpdateProcessingTaskContext *ctxt;
-	TrackerTask *sparql_task;
+	TrackerTask *sparql_task = NULL;
 	GFile *task_file;
 	gchar *uri;
 
@@ -1908,7 +1908,12 @@ item_add_or_update_cb (TrackerMinerFS *fs,
 		g_message ("Could not process '%s': %s", uri, error->message);
 
 		fs->priv->total_files_notified_error++;
-		sparql_task = tracker_sparql_task_new_with_sparql (task_file, ctxt->builder);
+
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) &&
+		    !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+			sparql_task = tracker_sparql_task_new_with_sparql (task_file,
+			                                                   ctxt->builder);
+		}
 	} else {
 		if (ctxt->urn) {
 			gboolean attribute_update_only;
@@ -1965,11 +1970,13 @@ item_add_or_update_cb (TrackerMinerFS *fs,
 		}
 	}
 
-	tracker_sparql_buffer_push (fs->priv->sparql_buffer,
-	                            sparql_task,
-	                            ctxt->priority,
-	                            sparql_buffer_task_finished_cb,
-	                            fs);
+	if (sparql_task) {
+		tracker_sparql_buffer_push (fs->priv->sparql_buffer,
+		                            sparql_task,
+		                            ctxt->priority,
+		                            sparql_buffer_task_finished_cb,
+		                            fs);
+	}
 
 	if (!tracker_task_pool_limit_reached (TRACKER_TASK_POOL (fs->priv->sparql_buffer))) {
 		item_queue_handlers_set_up (fs);