search: improve debug messages and add missing debug

4 files changed, 35 insertions, 5 deletions

diff --git a/libnautilus-private/nautilus-search-engine-model.c b/libnautilus-private/nautilus-search-engine-model.c
index 6b4166b7e..22a644e2e 100644
--- a/libnautilus-private/nautilus-search-engine-model.c
+++ b/libnautilus-private/nautilus-search-engine-model.c
@@ -28,6 +28,8 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-file.h"
 #include "nautilus-ui-utilities.h"
+#define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+#include "nautilus-debug.h"
 
 #include <string.h>
 #include <glib.h>
@@ -78,6 +80,7 @@ static gboolean
 search_finished (NautilusSearchEngineModel *model)
 {
 	if (model->details->hits != NULL) {
+	        DEBUG ("Model engine hits added");
 		nautilus_search_provider_hits_added (NAUTILUS_SEARCH_PROVIDER (model),
 						     model->details->hits);
 		g_list_free_full (model->details->hits, g_object_unref);
@@ -86,6 +89,7 @@ search_finished (NautilusSearchEngineModel *model)
 
 	model->details->query_pending = FALSE;
 	nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (model));
+	DEBUG ("Model engine finished");
 	g_object_unref (model);
 
 	return FALSE;
@@ -165,6 +169,8 @@ nautilus_search_engine_model_start (NautilusSearchProvider *provider)
 		return;
 	}
 
+	DEBUG ("Model engine start");
+
 	g_object_ref (model);
 	model->details->query_pending = TRUE;
 
@@ -186,6 +192,8 @@ nautilus_search_engine_model_stop (NautilusSearchProvider *provider)
 	model = NAUTILUS_SEARCH_ENGINE_MODEL (provider);
 
 	if (model->details->query_pending) {
+	        DEBUG ("Model engine stop");
+
 		nautilus_directory_cancel_callback (model->details->directory,
 						    model_directory_ready_cb, model);
 		search_finished_idle (model);
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 75b88cd95..2ce3bf977 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -137,8 +137,12 @@ search_thread_done_idle (gpointer user_data)
 	SearchThreadData *data = user_data;
 	NautilusSearchEngineSimple *engine = data->engine;
 
-	DEBUG ("Simple engine done");
 
+        if (g_cancellable_is_cancelled (data->cancellable)) {
+	        DEBUG ("Simple engine finished and cancelled");
+        } else {
+	        DEBUG ("Simple engine finished");
+        }
 	engine->details->active_search = NULL;
 	nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (engine));
 
@@ -158,9 +162,8 @@ search_thread_add_hits_idle (gpointer user_data)
 {
 	SearchHitsData *data = user_data;
 
-	DEBUG ("Simple engine add hits");
-
 	if (!g_cancellable_is_cancelled (data->thread_data->cancellable)) {
+	        DEBUG ("Simple engine add hits");
 		nautilus_search_provider_hits_added (NAUTILUS_SEARCH_PROVIDER (data->thread_data->engine),
 						     data->hits);
 	}
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
index 1a841e9a6..85e4122ff 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -26,6 +26,8 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-search-hit.h"
 #include "nautilus-search-provider.h"
+#define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+#include "nautilus-debug.h"
 
 #include <string.h>
 #include <gio/gio.h>
@@ -79,6 +81,8 @@ check_pending_hits (NautilusSearchEngineTracker *tracker,
 	GList *hits = NULL;
 	NautilusSearchHit *hit;
 
+	DEBUG ("Tracker engine add hits");
+
 	if (!force_send &&
 	    g_queue_get_length (tracker->details->hits_pending) < BATCH_SIZE) {
 		return;
@@ -96,6 +100,8 @@ static void
 search_finished (NautilusSearchEngineTracker *tracker,
 		 GError *error)
 {
+	DEBUG ("Tracker engine finished");
+
 	if (error == NULL) {
 		check_pending_hits (tracker, TRUE);
 	} else {
@@ -106,9 +112,15 @@ search_finished (NautilusSearchEngineTracker *tracker,
 	tracker->details->query_pending = FALSE;
 
 	if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+	        DEBUG ("Tracker engine error %s", error->message);
 		nautilus_search_provider_error (NAUTILUS_SEARCH_PROVIDER (tracker), error->message);
 	} else {
 		nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (tracker));
+                if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+	                DEBUG ("Tracker engine finished and cancelled");
+                } else {
+	                DEBUG ("Tracker engine finished");
+                }
 	}
 
 	g_object_unref (tracker);
@@ -225,6 +237,8 @@ search_finished_idle (gpointer user_data)
 {
 	NautilusSearchEngineTracker *tracker = user_data;
 
+	DEBUG ("Tracker engine finished idle");
+
 	search_finished (tracker, NULL);
 
 	return FALSE;
@@ -246,6 +260,7 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
 		return;
 	}
 
+	DEBUG ("Tracker engine start");
 	g_object_ref (tracker);
 	tracker->details->query_pending = TRUE;
 
@@ -324,6 +339,7 @@ nautilus_search_engine_tracker_stop (NautilusSearchProvider *provider)
 	tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
 	
 	if (tracker->details->query_pending) {
+		DEBUG ("Tracker engine stop");
 		g_cancellable_cancel (tracker->details->cancellable);
 		g_clear_object (&tracker->details->cancellable);
 		tracker->details->query_pending = FALSE;
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index 42b7ab7ed..a48b61a07 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -188,15 +188,18 @@ check_providers_status (NautilusSearchEngine *engine)
 		nautilus_search_provider_error (NAUTILUS_SEARCH_PROVIDER (engine),
 						_("Unable to complete the requested search"));
 	} else {
-		DEBUG ("Search engine finished");
 		nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (engine));
+                if (engine->details->restart) {
+		        DEBUG ("Search engine finished and restarting");
+                } else {
+		        DEBUG ("Search engine finished");
+                }
 	}
 
 	engine->details->running = FALSE;
 	g_hash_table_remove_all (engine->details->uris);
 
 	if (engine->details->restart) {
-		DEBUG ("Restarting engine");
 		nautilus_search_engine_start (NAUTILUS_SEARCH_PROVIDER (engine));
 	}