Removed tracker-crawler.c, tracker-miner.h, not used here

2 files changed, 0 insertions, 1311 deletions

diff --git a/src/tracker-miner-fs/tracker-crawler.c b/src/tracker-miner-fs/tracker-crawler.c
deleted file mode 100644
index fa0af8faf..000000000
--- a/src/tracker-miner-fs/tracker-crawler.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <gio/gio.h>
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-module-config.h>
-
-#include "tracker-config.h"
-#include "tracker-crawler.h"
-#include "tracker-dbus.h"
-#include "tracker-monitor.h"
-#include "tracker-marshal.h"
-#include "tracker-status.h"
-#include "tracker-utils.h"
-
-#define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
-
-#define FILE_ATTRIBUTES				\
-	G_FILE_ATTRIBUTE_STANDARD_NAME ","	\
-	G_FILE_ATTRIBUTE_STANDARD_TYPE
-
-#define FILES_QUEUE_PROCESS_INTERVAL 2000
-#define FILES_QUEUE_PROCESS_MAX      5000
-
-/* This is the number of files to be called back with from GIO at a
- * time so we don't get called back for every file.
- */
-#define FILES_GROUP_SIZE	     100
-
-struct _TrackerCrawlerPrivate {
-	TrackerConfig  *config;
-
-	gchar	       *module_name;
-
-	/* Found data */
-	GQueue	       *directories;
-	GQueue	       *files;
-
-	/* Idle handler for processing found data */
-	guint		idle_id;
-
-	/* Options */
-	gboolean	use_module_paths;
-
-	/* Actual paths that exist which we are crawling:
-	 *
-	 *  - 'Paths' are non-recursive.
-	 *  - 'Recurse Paths' are recursive.
-	 *  - 'Special Paths' are recursive but not in module config.
-	 */
-	GSList	       *paths;
-	GSList	       *paths_current;
-	gboolean	paths_are_done;
-
-	GSList	       *recurse_paths;
-	GSList	       *recurse_paths_current;
-	gboolean	recurse_paths_are_done;
-
-	GSList	       *special_paths;
-	GSList	       *special_paths_current;
-	gboolean	special_paths_are_done;
-
-	/* Ignore/Index patterns */
-	GList	       *ignored_directory_patterns;
-	GList	       *ignored_file_patterns;
-	GList	       *index_file_patterns;
-	GList          *ignored_directories_with_content;
-
-	/* Legacy NoWatchDirectoryRoots */
-	GSList	       *no_watch_directory_roots;
-	GSList	       *watch_directory_roots;
-	GSList	       *crawl_directory_roots;
-
-	/* Statistics */
-	GTimer	       *timer;
-	guint		enumerations;
-	guint		directories_found;
-	guint		directories_ignored;
-	guint		files_found;
-	guint		files_ignored;
-
-	/* Status */
-	gboolean	is_running;
-	gboolean	is_finished;
-	gboolean        was_started;
-};
-
-enum {
-	PROCESSING_DIRECTORY,
-	PROCESSING_FILE,
-	FINISHED,
-	LAST_SIGNAL
-};
-
-typedef struct {
-	GFile *child;
-	gboolean is_dir;
-} EnumeratorChildData;
-
-typedef struct {
-	TrackerCrawler *crawler;
-	GFile	       *parent;
-	GHashTable     *children;
-} EnumeratorData;
-
-static void tracker_crawler_finalize (GObject	      *object);
-static void file_enumerate_next      (GFileEnumerator *enumerator,
-				      EnumeratorData  *ed);
-static void file_enumerate_children  (TrackerCrawler  *crawler,
-				      GFile	      *file);
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE(TrackerCrawler, tracker_crawler, G_TYPE_OBJECT)
-
-static void
-tracker_crawler_class_init (TrackerCrawlerClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = tracker_crawler_finalize;
-
-	signals[PROCESSING_DIRECTORY] =
-		g_signal_new ("processing-directory",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_OBJECT,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRING,
-			      G_TYPE_OBJECT);
-	signals[PROCESSING_FILE] =
-		g_signal_new ("processing-file",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_OBJECT,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_STRING,
-			      G_TYPE_OBJECT);
-	signals[FINISHED] =
-		g_signal_new ("finished",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      tracker_marshal_VOID__STRING_UINT_UINT_UINT_UINT,
-			      G_TYPE_NONE,
-			      5,
-			      G_TYPE_STRING,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT,
-			      G_TYPE_UINT);
-
-	g_type_class_add_private (object_class, sizeof (TrackerCrawlerPrivate));
-}
-
-static void
-tracker_crawler_init (TrackerCrawler *object)
-{
-	TrackerCrawlerPrivate *priv;
-
-	object->private = TRACKER_CRAWLER_GET_PRIVATE (object);
-
-	priv = object->private;
-
-	priv->directories = g_queue_new ();
-	priv->files = g_queue_new ();
-}
-
-static void
-tracker_crawler_finalize (GObject *object)
-{
-	TrackerCrawlerPrivate *priv;
-
-	priv = TRACKER_CRAWLER_GET_PRIVATE (object);
-
-	if (priv->timer) {
-		g_timer_destroy (priv->timer);
-	}
-
-	g_slist_foreach (priv->no_watch_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->no_watch_directory_roots);
-
-	g_slist_foreach (priv->watch_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->watch_directory_roots);
-
-	g_slist_foreach (priv->crawl_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->crawl_directory_roots);
-
-	if (priv->index_file_patterns) {
-		g_list_free (priv->index_file_patterns);
-	}
-
-	if (priv->ignored_directory_patterns) {
-		g_list_free (priv->ignored_directory_patterns);
-	}
-
-	if (priv->ignored_file_patterns) {
-		g_list_free (priv->ignored_file_patterns);
-	}
-
-	if (priv->ignored_directories_with_content) {
-		g_list_free (priv->ignored_directories_with_content);
-	}
-
-	/* Don't free the 'current_' variant of these, they are just
-	 * place holders so we know our status.
-	 */
-	g_slist_foreach (priv->paths, (GFunc) g_free, NULL);
-	g_slist_free (priv->paths);
-
-	g_slist_foreach (priv->recurse_paths, (GFunc) g_free, NULL);
-	g_slist_free (priv->recurse_paths);
-
-	g_slist_foreach (priv->special_paths, (GFunc) g_free, NULL);
-	g_slist_free (priv->special_paths);
-
-	if (priv->idle_id) {
-		g_source_remove (priv->idle_id);
-	}
-
-	g_queue_foreach (priv->files, (GFunc) g_object_unref, NULL);
-	g_queue_free (priv->files);
-
-	g_queue_foreach (priv->directories, (GFunc) g_object_unref, NULL);
-	g_queue_free (priv->directories);
-
-	g_free (priv->module_name);
-
-	g_object_unref (priv->config);
-
-	G_OBJECT_CLASS (tracker_crawler_parent_class)->finalize (object);
-}
-
-TrackerCrawler *
-tracker_crawler_new (TrackerConfig *config,
-		     const gchar   *module_name)
-{
-	TrackerCrawler *crawler;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
-	g_return_val_if_fail (module_name != NULL, NULL);
-
-	crawler = g_object_new (TRACKER_TYPE_CRAWLER, NULL);
-
-	crawler->private->config = g_object_ref (config);
-
-	crawler->private->module_name = g_strdup (module_name);
-
-	/* Set up crawl data */
-	crawler->private->ignored_directory_patterns =
-		tracker_module_config_get_ignored_directory_patterns (module_name);
-	crawler->private->ignored_file_patterns =
-		tracker_module_config_get_ignored_file_patterns (module_name);
-	crawler->private->index_file_patterns =
-		tracker_module_config_get_index_file_patterns (module_name);
-	crawler->private->ignored_directories_with_content =
-		tracker_module_config_get_ignored_directories_with_content (module_name);
-
-	/* Should we use module config paths? If true, when we
-	 * _start() the module config paths are used to import paths
-	 * to crawl. By default this is TRUE.
-	 */
-	crawler->private->use_module_paths = TRUE;
-
-	return crawler;
-}
-
-/*
- * Functions
- */
-
-static gboolean
-is_path_ignored (TrackerCrawler *crawler,
-		 const gchar	*path,
-		 gboolean	 is_directory)
-{
-	GList	 *l;
-	gchar	 *basename;
-	gboolean  ignore;
-
-	if (tracker_is_empty_string (path)) {
-		return TRUE;
-	}
-
-	if (!g_utf8_validate (path, -1, NULL)) {
-		g_message ("Ignoring path:'%s', not valid UTF-8", path);
-		return TRUE;
-	}
-
-	if (is_directory) {
-		GSList *sl;
-
-		/* Most common things to ignore */
-		if (strcmp (path, "/dev") == 0 ||
-		    strcmp (path, "/lib") == 0 ||
-		    strcmp (path, "/proc") == 0 ||
-		    strcmp (path, "/sys") == 0) {
-			return TRUE;
-		}
-
-		if (g_str_has_prefix (path, g_get_tmp_dir ())) {
-			return TRUE;
-		}
-
-		/* Check ignored directories in config */
-		for (sl = crawler->private->no_watch_directory_roots; sl; sl = sl->next) {
-			if (strcmp (sl->data, path) == 0) {
-				return TRUE;
-			}
-		}
-	}
-
-	/* Check basename against pattern matches */
-	basename = g_path_get_basename (path);
-	ignore = TRUE;
-
-	if (!basename) {
-		goto done;
-	}
-
-	/* Test ignore types */
-	if (is_directory) {
-		GSList *sl;
-
-		/* If directory begins with ".", check it isn't one of
-		 * the top level directories to watch/crawl if it
-		 * isn't we ignore it. If it is, we don't.
-		 */
-		if (basename[0] == '.') {
-			for (sl = crawler->private->watch_directory_roots; sl; sl = sl->next) {
-				if (strcmp (sl->data, path) == 0) {
-					ignore = FALSE;
-					goto done;
-				}
-			}
-
-			for (sl = crawler->private->crawl_directory_roots; sl; sl = sl->next) {
-				if (strcmp (sl->data, path) == 0) {
-					ignore = FALSE;
-					goto done;
-				}
-			}
-
-			goto done;
-		}
-
-		/* Check module directory ignore patterns */
-		for (l = crawler->private->ignored_directory_patterns; l; l = l->next) {
-			if (g_pattern_match_string (l->data, basename)) {
-				goto done;
-			}
-		}
-	} else {
-		if (basename[0] == '.') {
-			goto done;
-		}
-
-		/* Check module file ignore patterns */
-		for (l = crawler->private->ignored_file_patterns; l; l = l->next) {
-			if (g_pattern_match_string (l->data, basename)) {
-				goto done;
-			}
-		}
-
-		/* Check module file match patterns */
-		for (l = crawler->private->index_file_patterns; l; l = l->next) {
-			if (!g_pattern_match_string (l->data, basename)) {
-				goto done;
-			}
-		}
-	}
-
-	ignore = FALSE;
-
-done:
-	g_free (basename);
-
-	return ignore;
-}
-
-static void
-add_file (TrackerCrawler *crawler,
-	  GFile		 *file)
-{
-	gchar *path;
-
-	g_return_if_fail (G_IS_FILE (file));
-
-	path = g_file_get_path (file);
-
-	if (is_path_ignored (crawler, path, FALSE)) {
-		crawler->private->files_ignored++;
-
-		g_debug ("Ignored:'%s' (%d)",
-			 path,
-			 crawler->private->enumerations);
-	} else {
-		crawler->private->files_found++;
-
-		g_debug ("Found  :'%s' (%d)",
-			 path,
-			 crawler->private->enumerations);
-
-		g_queue_push_tail (crawler->private->files, g_object_ref (file));
-	}
-
-	g_free (path);
-}
-
-static void
-add_directory (TrackerCrawler *crawler,
-	       GFile	      *file)
-{
-	gchar *path;
-
-	g_return_if_fail (G_IS_FILE (file));
-
-	path = g_file_get_path (file);
-
-	if (is_path_ignored (crawler, path, TRUE)) {
-		crawler->private->directories_ignored++;
-
-		g_debug ("Ignored:'%s' (%d)",
-			 path,
-			 crawler->private->enumerations);
-	} else {
-		g_debug ("Found  :'%s' (%d)",
-			 path,
-			 crawler->private->enumerations);
-
-		g_queue_push_tail (crawler->private->directories, g_object_ref (file));
-	}
-
-	g_free (path);
-}
-
-static void
-process_file (TrackerCrawler *crawler,
-	      GFile	     *file)
-{
-	g_signal_emit (crawler, signals[PROCESSING_FILE], 0,
-		       crawler->private->module_name, file);
-}
-
-static void
-process_directory (TrackerCrawler *crawler,
-		   GFile	  *file)
-{
-	file_enumerate_children (crawler, file);
-}
-
-static gboolean
-process_func (gpointer data)
-{
-	TrackerCrawler	      *crawler;
-	TrackerCrawlerPrivate *priv;
-	GFile		      *file;
-
-	crawler = TRACKER_CRAWLER (data);
-	priv = crawler->private;
-
-	/* If manually paused, we hold off until unpaused */
-	if (tracker_status_get_is_paused_manually () ||
-	    tracker_status_get_is_paused_for_io ()) {
-		return TRUE;
-	}
-
-	/* Throttle the crawler, with testing, throttling every item
-	 * took the time to crawl 130k files from 7 seconds up to 68
-	 * seconds. So it is important to get this figure right.
-	 */
-	tracker_throttle (priv->config, 25);
-
-	/* Crawler files */
-	file = g_queue_pop_head (priv->files);
-
-	if (file) {
-		process_file (crawler, file);
-		g_object_unref (file);
-
-		return TRUE;
-	}
-
-	/* Crawler directories */
-	file = g_queue_pop_head (priv->directories);
-
-	if (file) {
-		process_directory (crawler, file);
-		g_object_unref (file);
-
-		return TRUE;
-	}
-
-	/* If we still have some async operations in progress, wait
-	 * for them to finish, if not, we are truly done.
-	 */
-	if (priv->enumerations > 0) {
-		return TRUE;
-	}
-
-	/* Process next path in list */
-	if (!priv->paths_are_done) {
-		/* This is done so we don't go over the list again
-		 * when we get to the end and the current item = NULL.
-		 */
-		priv->paths_are_done = TRUE;
-
-		if (!priv->paths_current) {
-			priv->paths_current = priv->paths;
-		}
-	} else {
-		if (priv->paths_current) {
-			priv->paths_current = priv->paths_current->next;
-		}
-	}
-
-	if (priv->paths_current) {
-		g_message ("  Searching directory:'%s'",
-			   (gchar*) priv->paths_current->data);
-
-		file = g_file_new_for_path (priv->paths_current->data);
-		add_directory (crawler, file);
-		g_object_unref (file);
-
-		return TRUE;
-	}
-
-	/* Process next recursive path in list */
-	if (!priv->recurse_paths_are_done) {
-		/* This is done so we don't go over the list again
-		 * when we get to the end and the current item = NULL.
-		 */
-		priv->recurse_paths_are_done = TRUE;
-
-		if (!priv->recurse_paths_current) {
-			priv->recurse_paths_current = priv->recurse_paths;
-		}
-	} else {
-		if (priv->recurse_paths_current) {
-			priv->recurse_paths_current = priv->recurse_paths_current->next;
-		}
-	}
-
-	if (priv->recurse_paths_current) {
-		g_message ("  Searching directory:'%s' (recursively)",
-			   (gchar *) priv->recurse_paths_current->data);
-
-		file = g_file_new_for_path (priv->recurse_paths_current->data);
-		add_directory (crawler, file);
-		g_object_unref (file);
-
-		return TRUE;
-	}
-
-	/* Process next special path in list */
-	if (!priv->special_paths_are_done) {
-		/* This is done so we don't go over the list again
-		 * when we get to the end and the current item = NULL.
-		 */
-		priv->special_paths_are_done = TRUE;
-
-		if (!priv->special_paths_current) {
-			priv->special_paths_current = priv->special_paths;
-		}
-	} else {
-		if (priv->special_paths_current) {
-			priv->special_paths_current = priv->special_paths_current->next;
-		}
-	}
-
-	if (priv->special_paths_current) {
-		g_message ("  Searching directory:'%s' (special)",
-			   (gchar *) priv->special_paths_current->data);
-
-		file = g_file_new_for_path (priv->special_paths_current->data);
-		add_directory (crawler, file);
-		g_object_unref (file);
-
-		return TRUE;
-	}
-
-	priv->idle_id = 0;
-	priv->is_finished = TRUE;
-
-	tracker_crawler_stop (crawler);
-
-	return FALSE;
-}
-
-static EnumeratorChildData *
-enumerator_child_data_new (GFile    *child,
-			   gboolean  is_dir)
-{
-	EnumeratorChildData *cd;
-
-	cd = g_slice_new (EnumeratorChildData);
-
-	cd->child = g_object_ref (child);
-	cd->is_dir = is_dir;
-
-	return cd;
-}
-
-static void
-enumerator_child_data_free (EnumeratorChildData *cd)
-{
-	g_object_unref (cd->child);
-	g_slice_free (EnumeratorChildData, cd);
-}
-
-static EnumeratorData *
-enumerator_data_new (TrackerCrawler *crawler,
-		     GFile	    *parent)
-{
-	EnumeratorData *ed;
-
-	ed = g_slice_new0 (EnumeratorData);
-
-	ed->crawler = g_object_ref (crawler);
-	ed->parent = g_object_ref (parent);
-	ed->children = g_hash_table_new_full (g_str_hash,
-					      g_str_equal,
-					      (GDestroyNotify) g_free,
-					      (GDestroyNotify) enumerator_child_data_free);
-	return ed;
-}
-
-static void
-enumerator_data_add_child (EnumeratorData *ed,
-			   const gchar    *name,
-			   GFile          *file,
-			   gboolean        is_dir)
-{
-	g_hash_table_insert (ed->children,
-			     g_strdup (name),
-			     enumerator_child_data_new (file, is_dir));
-}
-
-static void
-enumerator_data_process (EnumeratorData *ed)
-{
-	TrackerCrawler *crawler;
-	GHashTableIter iter;
-	EnumeratorChildData *cd;
-	GList *l;
-
-	crawler = ed->crawler;
-
-	/* Ignore directory if its contents match something we should ignore */
-	for (l = crawler->private->ignored_directories_with_content; l; l = l->next) {
-		if (g_hash_table_lookup (ed->children, l->data)) {
-			gchar *path;
-
-			path = g_file_get_path (ed->parent);
-
-			crawler->private->directories_ignored++;
-			g_debug ("Ignoring directory '%s' since it contains a file named '%s'", path, (gchar *) l->data);
-			g_free (path);
-
-			return;
-		}
-	}
-
-	crawler->private->directories_found++;
-	g_signal_emit (crawler, signals[PROCESSING_DIRECTORY], 0,
-		       crawler->private->module_name, ed->parent);
-
-	g_hash_table_iter_init (&iter, ed->children);
-
-	while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &cd)) {
-		if (cd->is_dir) {
-			/* This is a bit of a hack, but we assume this is a
-			 * recursive lookup because the current non-recursive
-			 * path is NULL, meaning they have all been traversed
-			 * already.
-			 */
-			if (crawler->private->paths_are_done) {
-				add_directory (crawler, cd->child);
-			}
-		} else {
-			add_file (crawler, cd->child);
-		}
-	}
-}
-
-static void
-enumerator_data_free (EnumeratorData *ed)
-{
-	g_object_unref (ed->parent);
-	g_object_unref (ed->crawler);
-	g_hash_table_destroy (ed->children);
-	g_slice_free (EnumeratorData, ed);
-}
-
-static void
-file_enumerator_close_cb (GObject      *enumerator,
-			  GAsyncResult *result,
-			  gpointer	user_data)
-{
-	TrackerCrawler *crawler;
-	GError         *error = NULL;
-
-	crawler = TRACKER_CRAWLER (user_data);
-	crawler->private->enumerations--;
-
-	if (!g_file_enumerator_close_finish (G_FILE_ENUMERATOR (enumerator),
-					     result,
-					     &error)) {
-		g_warning ("Couldn't close GFileEnumerator (%p): %s", enumerator,
-			   (error) ? error->message : "No reason");
-
-		g_clear_error (&error);
-	}
-}
-
-static void
-file_enumerate_next_cb (GObject      *object,
-			GAsyncResult *result,
-			gpointer      user_data)
-{
-	TrackerCrawler	*crawler;
-	EnumeratorData	*ed;
-	GFileEnumerator *enumerator;
-	GFile		*parent, *child;
-	GFileInfo	*info;
-	GList		*files, *l;
-	GError          *error = NULL;
-
-	enumerator = G_FILE_ENUMERATOR (object);
-
-	ed = (EnumeratorData*) user_data;
-	crawler = ed->crawler;
-	parent = ed->parent;
-
-	files = g_file_enumerator_next_files_finish (enumerator,
-						     result,
-						     &error);
-
-	if (error || !files || !crawler->private->is_running) {
-		if (error) {
-			g_critical ("Could not crawl through directory: %s", error->message);
-			g_error_free (error);
-		}
-
-		/* No more files or we are stopping anyway, so clean
-		 * up and close all file enumerators.
-		 */
-		if (files) {
-			g_list_foreach (files, (GFunc) g_object_unref, NULL);
-			g_list_free (files);
-		}
-
-		enumerator_data_process (ed);
-		enumerator_data_free (ed);
-		g_file_enumerator_close_async (enumerator,
-					       G_PRIORITY_DEFAULT,
-					       NULL,
-					       file_enumerator_close_cb,
-					       crawler);
-		g_object_unref (enumerator);
-
-		return;
-	}
-
-	for (l = files; l; l = l->next) {
-		const gchar *child_name;
-		gboolean is_dir;
-
-		info = l->data;
-
-		child_name = g_file_info_get_name (info);
-		child = g_file_get_child (parent, child_name);
-		is_dir = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
-
-		enumerator_data_add_child (ed, child_name, child, is_dir);
-
-		g_object_unref (child);
-		g_object_unref (info);
-	}
-
-	g_list_free (files);
-
-	/* Get next files */
-	file_enumerate_next (enumerator, ed);
-}
-
-static void
-file_enumerate_next (GFileEnumerator *enumerator,
-		     EnumeratorData  *ed)
-{
-	g_file_enumerator_next_files_async (enumerator,
-					    FILES_GROUP_SIZE,
-					    G_PRIORITY_LOW,
-					    NULL,
-					    file_enumerate_next_cb,
-					    ed);
-}
-
-static void
-file_enumerate_children_cb (GObject	 *file,
-			    GAsyncResult *result,
-			    gpointer	  user_data)
-{
-	TrackerCrawler	*crawler;
-	EnumeratorData	*ed;
-	GFileEnumerator *enumerator;
-	GFile		*parent;
-	GError          *error = NULL;
-
-	parent = G_FILE (file);
-	ed = (EnumeratorData *) user_data;
-	crawler = ed->crawler;
-	enumerator = g_file_enumerate_children_finish (parent, result, &error);
-
-	if (!enumerator) {
-		if (error) {
-			gchar *uri;
-
-			uri = g_file_get_uri (parent);
-
-			/* Permission denied isn't worth a critical */
-			g_message ("Could not open directory '%s': %s",
-				    uri, error->message);
-
-			g_error_free (error);
-			g_free (uri);
-		}
-
-		crawler->private->enumerations--;
-		return;
-	}
-
-	/* Start traversing the directory's files */
-	file_enumerate_next (enumerator, ed);
-}
-
-static void
-file_enumerate_children (TrackerCrawler *crawler,
-			 GFile		*file)
-{
-	EnumeratorData *ed;
-
-	crawler->private->enumerations++;
-
-	ed = enumerator_data_new (crawler, file);
-
-	g_file_enumerate_children_async (file,
-					 FILE_ATTRIBUTES,
-					 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-					 G_PRIORITY_DEFAULT,
-					 NULL,
-					 file_enumerate_children_cb,
-					 ed);
-}
-
-static GSList *
-prune_none_existing_gslist_paths (TrackerCrawler *crawler, 
-				  GSList         *paths,
-				  const gchar    *path_type)
-{
-	TrackerCrawlerPrivate *priv;
-	GSList                *new_paths = NULL;
-
-	priv = crawler->private;
-
-	if (paths) {
-		GSList	 *l;
-		GFile	 *file;
-		gchar	 *path;
-		gboolean  exists;
-
-		/* Check the currently set recurse paths are real */
-		for (l = paths; l; l = l->next) {
-			path = l->data;
-
-			/* Check location exists before we do anything */
-			file = g_file_new_for_path (path);
-			exists = g_file_query_exists (file, NULL);
-
-			if (exists) {
-				g_message ("  Directory:'%s' added to list to crawl exists %s%s%s",
-					   path,
-					   path_type ? "(" : "",
-					   path_type ? path_type : "",
-					   path_type ? ")" : "");
-				new_paths = g_slist_prepend (new_paths, g_strdup (path));
-			} else {
-				g_message ("  Directory:'%s' does not exist",
-					   path);
-			}
-
-			g_object_unref (file);
-		}
-
-		new_paths = g_slist_reverse (new_paths);
-	}
-
-	return new_paths;
-}
-
-static GSList *
-prune_none_existing_glist_paths (TrackerCrawler *crawler, 
-				 GList          *paths,
-				 const gchar    *path_type)
-{
-	GSList *temporary_paths;
-	GSList *new_paths;
-	GList  *l;
-
-	/* The only difference with this function is that it takes a
-	 * GList instead of a GSList.
-	 */
-
-	temporary_paths = NULL;
-
-	for (l = paths; l; l = l->next) {
-		temporary_paths = g_slist_prepend (temporary_paths, l->data);
-	}
-
-	temporary_paths = g_slist_reverse (temporary_paths);
-	new_paths = prune_none_existing_gslist_paths (crawler, temporary_paths, path_type);
-	g_slist_free (temporary_paths);
-
-	return new_paths;
-}
-
-gboolean
-tracker_crawler_start (TrackerCrawler *crawler)
-{
-	TrackerCrawlerPrivate *priv;
-	GSList                *l;
-
-	g_return_val_if_fail (TRACKER_IS_CRAWLER (crawler), FALSE);
-
-	priv = crawler->private;
-
-	priv->was_started = TRUE;
-
-	g_message ("Crawling directories for module:'%s'",
-		   crawler->private->module_name);
-
-	if (priv->use_module_paths) {
-		GSList *new_paths;
-		GList  *recurse_paths;
-		GList  *paths;
-
-		g_message ("  Using module paths");
-
-		recurse_paths =	tracker_module_config_get_monitor_recurse_directories (priv->module_name);
-		paths = tracker_module_config_get_monitor_directories (priv->module_name);
-
-		if (recurse_paths || paths) {
-			/* First we do non-recursive directories */
-			new_paths = prune_none_existing_glist_paths (crawler, paths, NULL);
-			g_slist_foreach (priv->paths, (GFunc) g_free, NULL);
-			g_slist_free (priv->paths);
-			priv->paths = new_paths;
-
-			/* Second we do recursive directories */
-			new_paths = prune_none_existing_glist_paths (crawler, recurse_paths, "recursively");
-			g_slist_foreach (priv->recurse_paths, (GFunc) g_free, NULL);
-			g_slist_free (priv->recurse_paths);
-			priv->recurse_paths = new_paths;
-		} else {
-			g_message ("  No directories from module config");
-		}
-
-		g_list_free (paths);
-		g_list_free (recurse_paths);
-	} else {
-		GSList *new_paths;
-
-		g_message ("  Not using module config paths, using special paths added");
-
-		new_paths = prune_none_existing_gslist_paths (crawler, priv->special_paths, "special");
-		g_slist_foreach (priv->special_paths, (GFunc) g_free, NULL);
-		g_slist_free (priv->special_paths);
-		priv->special_paths = new_paths;
-	}
-
-	if (!priv->paths && !priv->recurse_paths && !priv->special_paths) {
-		g_message ("  No directories that actually exist to iterate, doing nothing");
-		return FALSE;
-	}
-
-	/* Filter duplicates */
-	l = priv->paths;
-	priv->paths = tracker_path_list_filter_duplicates (priv->paths, ".");
-	g_slist_foreach (l, (GFunc) g_free, NULL);
-	g_slist_free (l);
-
-	l = priv->recurse_paths;
-	priv->recurse_paths = tracker_path_list_filter_duplicates (priv->recurse_paths, ".");
-	g_slist_foreach (l, (GFunc) g_free, NULL);
-	g_slist_free (l);
-
-	l = priv->special_paths;
-	priv->special_paths = tracker_path_list_filter_duplicates (priv->special_paths, ".");
-	g_slist_foreach (l, (GFunc) g_free, NULL);
-	g_slist_free (l);
-
-	/* Set up legacy NoWatchDirectoryRoots so we don't have to get
-	 * them from the config for EVERY file we traverse.
-	 */
-	g_slist_foreach (priv->no_watch_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->no_watch_directory_roots);
-	l = tracker_config_get_no_watch_directory_roots (priv->config);
-	priv->no_watch_directory_roots = tracker_gslist_copy_with_string_data (l);
-
-	g_slist_foreach (priv->watch_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->watch_directory_roots);
-	l = tracker_config_get_watch_directory_roots (priv->config);
-	priv->watch_directory_roots = tracker_gslist_copy_with_string_data (l);
-
-	g_slist_foreach (priv->crawl_directory_roots, (GFunc) g_free, NULL);
-	g_slist_free (priv->crawl_directory_roots);
-	l = tracker_config_get_crawl_directory_roots (priv->config);
-	priv->crawl_directory_roots = tracker_gslist_copy_with_string_data (l);
-
-	/* Time the event */
-	if (priv->timer) {
-		g_timer_destroy (priv->timer);
-	}
-
-	priv->timer = g_timer_new ();
-
-	/* Set as running now */
-	priv->is_running = TRUE;
-	priv->is_finished = FALSE;
-
-	/* Reset stats */
-	priv->directories_found = 0;
-	priv->directories_ignored = 0;
-	priv->files_found = 0;
-	priv->files_ignored = 0;
-
-	/* Reset paths which have been iterated */
-	priv->paths_are_done = FALSE;
-	priv->recurse_paths_are_done = FALSE;
-	priv->special_paths_are_done = FALSE;
-
-	/* Set idle handler to process directories and files found */
-	priv->idle_id = g_idle_add (process_func, crawler);
-
-	return TRUE;
-}
-
-void
-tracker_crawler_stop (TrackerCrawler *crawler)
-{
-	TrackerCrawlerPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-
-	priv = crawler->private;
-
-
-	g_message ("  %s crawling files in %4.4f seconds",
-		   priv->is_finished ? "Finished" : "Stopped",
-		   g_timer_elapsed (priv->timer, NULL));
-	g_message ("  Found %d directories, ignored %d directories",
-		   priv->directories_found,
-		   priv->directories_ignored);
-	g_message ("  Found %d files, ignored %d files",
-		   priv->files_found,
-		   priv->files_ignored);
-
-	priv->is_running = FALSE;
-
-	if (priv->idle_id) {
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
-
-	if (priv->timer) {
-		g_timer_destroy (priv->timer);
-		priv->timer = NULL;
-	}
-
-	g_signal_emit (crawler, signals[FINISHED], 0,
-		       priv->module_name,
-		       priv->directories_found,
-		       priv->directories_ignored,
-		       priv->files_found,
-		       priv->files_ignored);
-}
-
-/* This function is a convenience for the monitor module so we can
- * just ask it to crawl another path which we didn't know about
- * before.
- */
-void
-tracker_crawler_add_unexpected_path (TrackerCrawler *crawler,
-				     const gchar    *path)
-{
-	TrackerCrawlerPrivate *priv;
-	GFile                 *file;
-
-	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-	g_return_if_fail (path != NULL);
-
-	priv = crawler->private;
-
-	/* This check should be fine, the reason being, that if we
-	 * call this, it is because we have received a monitor event
-	 * in the first place. This means we must already have been
-	 * started at some point.
-	 */
-	g_return_if_fail (priv->was_started);
-
-	/* FIXME: Should we check paths_are_done to see if we
-	 * need to actually call add_directory()?
-	 */
-	file = g_file_new_for_path (path);
-	add_directory (crawler, file);
-	g_object_unref (file);
-	
-	/* FIXME: Should we reset the stats? */
-	if (!priv->idle_id) {
-		/* Time the event */
-		if (priv->timer) {
-			g_timer_destroy (priv->timer);
-		}
-		
-		priv->timer = g_timer_new ();
-		
-		/* Set as running now */
-		priv->is_running = TRUE;
-		priv->is_finished = FALSE;
-	
-		/* Set idle handler to process directories and files found */
-		priv->idle_id = g_idle_add (process_func, crawler);
-	}
-}
-
-
-/* This is a convenience function to add extra locations because
- * sometimes we want to add locations like the MMC or others to the
- * "Files" module, for example.
- */
-void
-tracker_crawler_special_paths_add (TrackerCrawler *crawler,
-				   const gchar    *path)
-{
-	TrackerCrawlerPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-	g_return_if_fail (path != NULL);
-
-	priv = crawler->private;
-
-	g_return_if_fail (!priv->is_running);
-
-	priv->special_paths = g_slist_append (priv->special_paths, g_strdup (path));
-}
-
-void
-tracker_crawler_special_paths_clear (TrackerCrawler *crawler)
-{
-	TrackerCrawlerPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-
-	priv = crawler->private;
-
-	g_return_if_fail (!priv->is_running);
-
-	g_slist_foreach (priv->special_paths, (GFunc) g_free, NULL);
-	g_slist_free (priv->special_paths);
-	priv->special_paths = NULL;
-}
-
-void
-tracker_crawler_use_module_paths (TrackerCrawler *crawler,
-				  gboolean        use_module_paths)
-{
-	TrackerCrawlerPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CRAWLER (crawler));
-
-	priv = crawler->private;
-
-	g_return_if_fail (priv->is_running == FALSE);
-
-	priv->use_module_paths = use_module_paths;
-}
-
-gboolean
-tracker_crawler_is_path_ignored (TrackerCrawler *crawler,
-				 const gchar	*path,
-				 gboolean	 is_directory)
-{
-	g_return_val_if_fail (TRACKER_IS_CRAWLER (crawler), TRUE);
-
-	/* We have an internal function here we call. The reason for
-	 * this is that it is expensive to type check the Crawler
-	 * object for EVERY file we process. Internally, we don't do
-	 * that. Externally we do. Externally this is used by the
-	 * processor when we get new monitor events to know if we
-	 * should be sending new files to the indexer.
-	 */
-	return is_path_ignored (crawler, path, is_directory);
-}
diff --git a/src/tracker-miner-fs/tracker-miner.h b/src/tracker-miner-fs/tracker-miner.h
deleted file mode 100644
index 73136fa7a..000000000
--- a/src/tracker-miner-fs/tracker-miner.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009, Nokia
-
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#ifndef __TRACKER_MINER_FS_MINER_H__
-#define __TRACKER_MINER_FS_MINER_H__
-
-#include <glib-object.h>
-#include <dbus/dbus-glib.h>
-
-#include "tracker-indexer.h"
-
-#define TRACKER_MINER_SERVICE      "org.freedesktop.Tracker1.Miner.FS"
-#define TRACKER_MINER_PATH         "/org/freedesktop/Tracker1/Miner/FS"
-#define TRACKER_MINER_INTERFACE    "org.freedesktop.Tracker1.Miner.FS"
-
-G_BEGIN_DECLS
-
-#define TRACKER_TYPE_MINER	   (tracker_miner_get_type())
-#define TRACKER_MINER(o)	   (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
-#define TRACKER_MINER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_MINER, TrackerMinerClass))
-#define TRACKER_IS_MINER(o)	   (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_MINER))
-#define TRACKER_IS_MINER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c),    TRACKER_TYPE_MINER))
-#define TRACKER_MINER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o),  TRACKER_TYPE_MINER, TrackerMinerClass))
-
-typedef struct TrackerMiner	   TrackerMiner;
-typedef struct TrackerMinerClass   TrackerMinerClass;
-typedef struct TrackerMinerPrivate TrackerMinerPrivate;
-
-struct TrackerMiner {
-	GObject parent_instance;
-
-	/* Private struct */
-	TrackerMinerPrivate *private;
-};
-
-struct TrackerMinerClass {
-	GObjectClass parent_class;
-
-	void (*paused)	 (TrackerMiner *miner);
-	void (*continued)(TrackerMiner *miner);
-};
-
-GType	      tracker_miner_get_type (void) G_GNUC_CONST;
-TrackerMiner *tracker_miner_new      (TrackerIndexer *indexer);
-
-
-/* DBus methods */
-void          tracker_miner_pause    (TrackerMiner           *miner,
-				      DBusGMethodInvocation  *context,
-				      GError                **error);
-void          tracker_miner_continue (TrackerMiner           *miner,
-				      DBusGMethodInvocation  *context,
-				      GError                **error);
-
-G_END_DECLS
-
-#endif /* __TRACKER_MINER_FS_MINER_H__ */