diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2019-03-03 00:21:06 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2019-03-03 00:37:19 +0100 |
| commit | fbb40507f70e416164ad039c4c648166d59c14dd (patch) | |
| tree | 757ac8ed89cf28483d16c896c8184ed979754284 | |
| parent | b3d7abf30623d1cbdd691afd36706c9e51600686 (diff) | |
| download | tracker-fbb40507f70e416164ad039c4c648166d59c14dd.tar.gz | |
libtracker-miner: Handle deletes of files triggering parent folder filters
Theoretically at least, since we don't have file monitors on the directory
in that case. The code is now correct at least.
| -rw-r--r-- | src/libtracker-miner/tracker-file-notifier.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/libtracker-miner/tracker-file-notifier.c b/src/libtracker-miner/tracker-file-notifier.c index b2960dab1..a0951cd73 100644 --- a/src/libtracker-miner/tracker-file-notifier.c +++ b/src/libtracker-miner/tracker-file-notifier.c @@ -1288,12 +1288,6 @@ monitor_item_deleted_cb (TrackerMonitor *monitor, tracker_monitor_remove_recursively (priv->monitor, file); } - if (!tracker_indexing_tree_file_is_indexable (priv->indexing_tree, - file, file_type)) { - /* File was not indexed */ - return ; - } - if (!is_directory) { TrackerDirectoryFlags flags; gboolean indexable; @@ -1305,7 +1299,6 @@ monitor_item_deleted_cb (TrackerMonitor *monitor, indexable = tracker_indexing_tree_parent_is_indexable (priv->indexing_tree, parent, children); - g_object_unref (parent); g_list_free (children); /* note: This supposedly works, but in practice @@ -1317,15 +1310,23 @@ monitor_item_deleted_cb (TrackerMonitor *monitor, /* New file was triggering a directory content * filter, reindex parent directory altogether */ - file = tracker_file_system_get_file (priv->file_system, - file, - G_FILE_TYPE_DIRECTORY, - NULL); + canonical = tracker_file_system_get_file (priv->file_system, + parent, + G_FILE_TYPE_DIRECTORY, + NULL); tracker_indexing_tree_get_root (priv->indexing_tree, - file, &flags); - notifier_queue_root (notifier, file, flags, FALSE); + canonical, &flags); + notifier_queue_root (notifier, canonical, flags, FALSE); return; } + + g_object_unref (parent); + } + + if (!tracker_indexing_tree_file_is_indexable (priv->indexing_tree, + file, file_type)) { + /* File was not indexed */ + return ; } /* Fetch the interned copy */ |