[tracker-miners/wip/carlosg/continue-after-error] libtracker-miner: Only jump to next index root when interrupted




commit 9f7af8c2b246385ea14ca1b3103fb7b7ee2302ac
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Nov 15 21:31:29 2020 +0100

    libtracker-miner: Only jump to next index root when interrupted
    
    We handle all error conditions as "should skip this root", it's not
    always the case.
    
    Fixes: https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/153

 src/libtracker-miner/tracker-file-notifier.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c
index 7317ed93e..5e56e381d 100644
--- a/src/libtracker-miner/tracker-file-notifier.c
+++ b/src/libtracker-miner/tracker-file-notifier.c
@@ -482,6 +482,11 @@ crawler_get_cb (TrackerCrawler *crawler,
                                         &files_found,
                                         &files_ignored,
                                         &error)) {
+               gboolean interrupted;
+
+               interrupted = error &&
+                       g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
+
                if (error &&
                    !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
                        gchar *uri;
@@ -492,7 +497,7 @@ crawler_get_cb (TrackerCrawler *crawler,
                        g_free (uri);
                }
                tracker_monitor_remove (priv->monitor, directory);
-               finish_current_directory (notifier, TRUE);
+               finish_current_directory (notifier, interrupted);
                g_clear_error (&error);
                return;
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]