[tracker-miners/wip/carlosg/tracker-index-add-duplicates: 244/244] tracker: Check recursive/single paths on "tracker3 index --add"

[Carlos Garnacho <carlosg src gnome org>]

commit aafe3671e94bb3cad9361f4d311c04c13c211889
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Aug 21 21:41:23 2020 +0200

    tracker: Check recursive/single paths on "tracker3 index --add"
    
    So we can't doubly add a directory to both settings.
    
    It is worth noting here that there are other means to end up with
    double folders (e.g. direct dconf manipulation), and tracker-miner-fs
    copes with the situation (effectively, a folder that is both
    non-recursive and recursive ends up being recursive). This is more
    of an UI issue.

 src/tracker/tracker-index.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index d493736bd..89ed32671 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -160,32 +160,30 @@ static int
 index_add (void)
 {
        gboolean handled = FALSE;
-       const gchar *setting_path;
        GSettings *settings;
-       GStrv dirs;
        guint i;
 
        settings = g_settings_new ("org.freedesktop.Tracker3.Miner.Files");
 
-       if (opt_recursive)
-               setting_path = "index-recursive-directories";
-       else
-               setting_path = "index-single-directories";
-
        for (i = 0; filenames[i]; i++) {
                GFile *file;
                gchar *path;
                const gchar *alias;
+               GStrv dirs, rec_dirs;
 
-               dirs = g_settings_get_strv (settings, setting_path);
+               dirs = g_settings_get_strv (settings, "index-single-directories");
+               rec_dirs = g_settings_get_strv (settings, "index-recursive-directories");
 
                file = g_file_new_for_commandline_arg (filenames[i]);
                path = g_file_get_path (file);
                alias = path_to_alias (path);
 
                if (g_strv_contains ((const gchar * const *) dirs, path) ||
-                   (alias && g_strv_contains ((const gchar * const *) dirs, alias))) {
+                   (alias && g_strv_contains ((const gchar * const *) dirs, alias)) ||
+                   g_strv_contains ((const gchar * const *) rec_dirs, path) ||
+                   (alias && g_strv_contains ((const gchar * const *) rec_dirs, alias))) {
                        g_strfreev (dirs);
+                       g_strfreev (rec_dirs);
                        handled = TRUE;
                        continue;
                }
@@ -195,16 +193,25 @@ index_add (void)
                                    path);
                        g_printerr ("\n");
                        g_strfreev (dirs);
+                       g_strfreev (rec_dirs);
                        continue;
                }
 
                handled = TRUE;
-               dirs = strv_add (dirs, path);
-               g_settings_set_strv (settings, setting_path,
-                                    (const gchar * const *) dirs);
+
+               if (opt_recursive) {
+                       rec_dirs = strv_add (rec_dirs, path);
+                       g_settings_set_strv (settings, "index-recursive-directories",
+                                            (const gchar * const *) rec_dirs);
+               } else {
+                       dirs = strv_add (dirs, path);
+                       g_settings_set_strv (settings, "index-single-directories",
+                                            (const gchar * const *) dirs);
+               }
 
                g_object_unref (file);
                g_strfreev (dirs);
+               g_strfreev (rec_dirs);
                g_free (path);
        }