[tracker/external-crawler: 1/42] libtracker-miner: IndexingTree _new() now takes a GFile

[Martyn James Russell <mr src gnome org>]

commit 59de756a78dad429dd62bcdd179973cd35e82297
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Apr 30 12:17:02 2014 +0100

    libtracker-miner: IndexingTree _new() now takes a GFile
    
    If NULL is passed, then it defaults to the behaviour before, which is to use
    file:/// as the root node.

 src/libtracker-miner/tracker-indexing-tree.c       |   40 ++++++++++++++++---
 src/libtracker-miner/tracker-indexing-tree.h       |    5 +-
 src/libtracker-miner/tracker-miner-fs.c            |    2 +-
 .../libtracker-miner/tracker-file-notifier-test.c  |    2 +-
 .../libtracker-miner/tracker-indexing-tree-test.c  |    2 +-
 5 files changed, 38 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-indexing-tree.c b/src/libtracker-miner/tracker-indexing-tree.c
index 743631e..23ab471 100644
--- a/src/libtracker-miner/tracker-indexing-tree.c
+++ b/src/libtracker-miner/tracker-indexing-tree.c
@@ -64,11 +64,13 @@ struct _TrackerIndexingTreePrivate
        GList *filter_patterns;
        TrackerFilterPolicy policies[TRACKER_FILTER_PARENT_DIRECTORY + 1];
 
+       GFile *root;
        guint filter_hidden : 1;
 };
 
 enum {
        PROP_0,
+       PROP_ROOT,
        PROP_FILTER_HIDDEN
 };
 
@@ -149,6 +151,9 @@ tracker_indexing_tree_get_property (GObject    *object,
        priv = TRACKER_INDEXING_TREE (object)->priv;
 
        switch (prop_id) {
+       case PROP_ROOT:
+               g_value_set_object (value, priv->root);
+               break;
        case PROP_FILTER_HIDDEN:
                g_value_set_boolean (value, priv->filter_hidden);
                break;
@@ -165,10 +170,15 @@ tracker_indexing_tree_set_property (GObject      *object,
                                     GParamSpec   *pspec)
 {
        TrackerIndexingTree *tree;
+       TrackerIndexingTreePrivate *priv;
 
        tree = TRACKER_INDEXING_TREE (object);
+       priv = tree->priv;
 
        switch (prop_id) {
+       case PROP_ROOT:
+               priv->root = g_value_dup_object (value);
+               break;
        case PROP_FILTER_HIDDEN:
                tracker_indexing_tree_set_filter_hidden (tree,
                                                         g_value_get_boolean (value));
@@ -199,6 +209,10 @@ tracker_indexing_tree_finalize (GObject *object)
                         NULL);
        g_node_destroy (priv->config_tree);
 
+       if (!priv->root) {
+               g_object_unref (priv->root);
+       }
+
        G_OBJECT_CLASS (tracker_indexing_tree_parent_class)->finalize (object);
 }
 
@@ -212,6 +226,14 @@ tracker_indexing_tree_class_init (TrackerIndexingTreeClass *klass)
        object_class->get_property = tracker_indexing_tree_get_property;
 
        g_object_class_install_property (object_class,
+                                        PROP_ROOT,
+                                        g_param_spec_object ("root",
+                                                             "Root URL",
+                                                             "The root GFile for the indexing tree",
+                                                             G_TYPE_FILE,
+                                                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+       g_object_class_install_property (object_class,
                                         PROP_FILTER_HIDDEN,
                                         g_param_spec_boolean ("filter-hidden",
                                                               "Filter hidden",
@@ -255,19 +277,20 @@ tracker_indexing_tree_init (TrackerIndexingTree *tree)
 {
        TrackerIndexingTreePrivate *priv;
        NodeData *data;
-       GFile *root;
        gint i;
 
        priv = tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree,
                                                         TRACKER_TYPE_INDEXING_TREE,
                                                         TrackerIndexingTreePrivate);
        /* Add a shallow root node */
-       root = g_file_new_for_uri ("file:///");
-       data = node_data_new (root, 0);
+       if (priv->root == NULL) {
+               priv->root = g_file_new_for_uri ("file:///");
+       }
+
+       data = node_data_new (priv->root, 0);
        data->shallow = TRUE;
 
        priv->config_tree = g_node_new (data);
-       g_object_unref (root);
 
        for (i = TRACKER_FILTER_FILE; i <= TRACKER_FILTER_PARENT_DIRECTORY; i++) {
                priv->policies[i] = TRACKER_FILTER_POLICY_ACCEPT;
@@ -276,15 +299,18 @@ tracker_indexing_tree_init (TrackerIndexingTree *tree)
 
 /**
  * tracker_indexing_tree_new:
+ * @root: The top level URL
  *
- * Returns a newly created #TrackerIndexingTree
+ * If @root is %NULL, the default value is 'file:///'.
  *
  * Returns: a newly allocated #TrackerIndexingTree
  **/
 TrackerIndexingTree *
-tracker_indexing_tree_new (void)
+tracker_indexing_tree_new (GFile *root)
 {
-       return g_object_new (TRACKER_TYPE_INDEXING_TREE, NULL);
+       return g_object_new (TRACKER_TYPE_INDEXING_TREE,
+                            "root", root,
+                            NULL);
 }
 
 #ifdef PRINT_INDEXING_TREE
diff --git a/src/libtracker-miner/tracker-indexing-tree.h b/src/libtracker-miner/tracker-indexing-tree.h
index 7f159a3..87b98c8 100644
--- a/src/libtracker-miner/tracker-indexing-tree.h
+++ b/src/libtracker-miner/tracker-indexing-tree.h
@@ -46,8 +46,7 @@ G_BEGIN_DECLS
 
 typedef struct _TrackerIndexingTree TrackerIndexingTree;
 
-struct _TrackerIndexingTree
-{
+struct _TrackerIndexingTree {
        GObject parent_instance;
        gpointer priv;
 };
@@ -78,7 +77,7 @@ typedef struct {
 
 GType                 tracker_indexing_tree_get_type (void) G_GNUC_CONST;
 
-TrackerIndexingTree * tracker_indexing_tree_new      (void);
+TrackerIndexingTree * tracker_indexing_tree_new      (GFile                 *root);
 
 void      tracker_indexing_tree_add                  (TrackerIndexingTree   *tree,
                                                       GFile                 *directory,
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index b208731..ca379d8 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -583,7 +583,7 @@ tracker_miner_fs_init (TrackerMinerFS *object)
                          G_CALLBACK (task_pool_limit_reached_notify_cb), object);
 
        /* Create the indexing tree */
-       priv->indexing_tree = tracker_indexing_tree_new ();
+       priv->indexing_tree = tracker_indexing_tree_new (NULL);
        g_signal_connect (priv->indexing_tree, "directory-removed",
                          G_CALLBACK (indexing_tree_directory_removed),
                          object);
diff --git a/tests/libtracker-miner/tracker-file-notifier-test.c 
b/tests/libtracker-miner/tracker-file-notifier-test.c
index 88922e4..ea10a3c 100644
--- a/tests/libtracker-miner/tracker-file-notifier-test.c
+++ b/tests/libtracker-miner/tracker-file-notifier-test.c
@@ -274,7 +274,7 @@ test_common_context_setup (TestCommonContext *fixture,
        CREATE_FOLDER (fixture, "non-recursive");
        CREATE_FOLDER (fixture, "non-indexed");
 
-       fixture->indexing_tree = tracker_indexing_tree_new ();
+       fixture->indexing_tree = tracker_indexing_tree_new (NULL);
        tracker_indexing_tree_set_filter_hidden (fixture->indexing_tree, TRUE);
 
        fixture->main_loop = g_main_loop_new (NULL, FALSE);
diff --git a/tests/libtracker-miner/tracker-indexing-tree-test.c 
b/tests/libtracker-miner/tracker-indexing-tree-test.c
index 78b874c..3e70630 100644
--- a/tests/libtracker-miner/tracker-indexing-tree-test.c
+++ b/tests/libtracker-miner/tracker-indexing-tree-test.c
@@ -96,7 +96,7 @@ test_common_context_setup (TestCommonContext *fixture,
        for (i = 0; i < TEST_DIRECTORY_LAST; i++)
                fixture->test_dir[i] = g_file_new_for_path (test_directories_subpaths[i]);
 
-       fixture->tree = tracker_indexing_tree_new ();
+       fixture->tree = tracker_indexing_tree_new (NULL);
 }
 
 static void