summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2020-11-12 17:40:40 +0100
committerVictor Toso <me@victortoso.com>2021-01-14 09:41:26 +0000
commit0ef8d306fbab740287cfb9360355305f03b93ac9 (patch)
treee49de06056eb04a02dc7a9567352ecf86a23bd58
parent7a2f9fbe8fe05525fe0930ac6109cf53a24216c4 (diff)
downloadgrilo-plugins-wip/jfelder/tracker3-delete-events.tar.gz
tracker3: Handle delete events betterwip/jfelder/tracker3-delete-events
These produce unnecessary busywork as resolving a deleted resource will not return any data, and also are mistakenly silenced away since they will end up without a URL. Only the media ID is reliable at that moment, so go with it.
-rw-r--r--src/tracker3/grl-tracker-source-notif.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tracker3/grl-tracker-source-notif.c b/src/tracker3/grl-tracker-source-notif.c
index 1b8e526..95aaf96 100644
--- a/src/tracker3/grl-tracker-source-notif.c
+++ b/src/tracker3/grl-tracker-source-notif.c
@@ -122,7 +122,8 @@ handle_changes (GrlTrackerSourceNotify *self,
if (tracker_notifier_event_get_event_type (event) != tracker_type)
continue;
- if (grl_media_get_url (media) == NULL)
+ if (tracker_type != TRACKER_NOTIFIER_EVENT_DELETE &&
+ grl_media_get_url (media) == NULL)
continue;
g_ptr_array_add (change_list, g_object_ref (media));
@@ -166,8 +167,16 @@ resolve_medias (GrlTrackerChangeBatch *batch)
GrlTrackerSourceNotify *self = batch->notify;
GrlMedia *media = NULL;
- if (batch->cur_media < batch->medias->len)
- media = g_ptr_array_index (batch->medias, batch->cur_media);
+ while (batch->cur_media < batch->medias->len) {
+ TrackerNotifierEvent *event = g_ptr_array_index (batch->events, batch->cur_media);
+ /* Resolving a deleted resource will come up empty */
+ if (tracker_notifier_event_get_event_type (event) != TRACKER_NOTIFIER_EVENT_DELETE) {
+ media = g_ptr_array_index (batch->medias, batch->cur_media);
+ break;
+ }
+
+ batch->cur_media++;
+ }
if (media) {
grl_source_resolve (self->source,