From afd9f9b95463e3a6179a87a9c347da4fd6d18fd6 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 24 Apr 2026 07:52:05 -0300 Subject: [PATCH] core/timeline: Remove message queueing and listeners "Let go and move on." - The Fool? Part-of: --- src/core/gcal-calendar-monitor.c | 49 +- src/core/gcal-calendar-monitor.h | 19 +- src/core/gcal-shell-search-provider.c | 22 - src/core/gcal-timeline-subscriber.h | 10 - src/core/gcal-timeline.c | 614 +------------------------- src/gui/common/gcal-date-chooser.c | 22 - src/gui/views/gcal-agenda-view.c | 22 - src/gui/views/gcal-month-view.c | 22 - src/gui/views/gcal-week-view.c | 22 - src/search/gcal-search-model.c | 22 - 10 files changed, 12 insertions(+), 812 deletions(-) diff --git a/src/core/gcal-calendar-monitor.c b/src/core/gcal-calendar-monitor.c index 53c893da..6690cd4d 100644 --- a/src/core/gcal-calendar-monitor.c +++ b/src/core/gcal-calendar-monitor.c @@ -62,9 +62,6 @@ struct _GcalCalendarMonitor gboolean complete; GcalEventList *event_list; - const GcalCalendarMonitorListener *listener; - gpointer listener_user_data; - /* * These fields are only accessed on the monitor thread, and * never on the main thread. @@ -1058,30 +1055,20 @@ remove_events_outside_range (GcalCalendarMonitor *self, } if (events_to_remove->len > 0) - { - self->listener->remove_events (self, events_to_remove, self->listener_user_data); - gcal_event_list_remove_events (self->event_list, (GcalEvent **) events_to_remove->pdata); - } + gcal_event_list_remove_events (self->event_list, (GcalEvent **) events_to_remove->pdata); } static void remove_all_events (GcalCalendarMonitor *self) { - g_autoptr (GPtrArray) events_to_remove = NULL; - g_assert (GCAL_IS_MAIN_THREAD ()); GCAL_TRACE_MSG ("Removing all events from view"); G_RW_LOCK_WRITER_AUTO_LOCK (&self->shared.lock, writer_locker); - events_to_remove = g_hash_table_steal_all_values (self->shared.events); - - if (events_to_remove->len > 0) - { - self->listener->remove_events (self, events_to_remove, self->listener_user_data); - gcal_event_list_remove_all_events (self->event_list); - } + g_hash_table_remove_all (self->shared.events); + gcal_event_list_remove_all_events (self->event_list); } static void @@ -1140,10 +1127,7 @@ add_events_to_timeline_in_idle_cb (gpointer user_data) } if (events_to_add->len > 0) - { - self->listener->add_events (self, events_to_add, self->listener_user_data); - gcal_event_list_add_events (self->event_list, (GcalEvent **) events_to_add->pdata); - } + gcal_event_list_add_events (self->event_list, (GcalEvent **) events_to_add->pdata); GCAL_RETURN (G_SOURCE_REMOVE); } @@ -1195,7 +1179,6 @@ update_events_in_idle_cb (gpointer user_data) if (new_events->len > 0) { - self->listener->update_events (self, old_events, new_events, self->listener_user_data); gcal_event_list_remove_events (self->event_list, (GcalEvent **) old_events->pdata); gcal_event_list_add_events (self->event_list, (GcalEvent **) new_events->pdata); } @@ -1241,10 +1224,7 @@ remove_events_from_timeline_in_idle_cb (gpointer user_data) } if (events_to_remove->len > 0) - { - self->listener->remove_events (self, events_to_remove, self->listener_user_data); - gcal_event_list_remove_events (self->event_list, (GcalEvent **) events_to_remove->pdata); - } + gcal_event_list_remove_events (self->event_list, (GcalEvent **) events_to_remove->pdata); GCAL_RETURN (G_SOURCE_REMOVE); } @@ -1413,23 +1393,13 @@ gcal_calendar_monitor_init (GcalCalendarMonitor *self) } GcalCalendarMonitor* -gcal_calendar_monitor_new (GcalCalendar *calendar, - const GcalCalendarMonitorListener *listener, - gpointer user_data) +gcal_calendar_monitor_new (GcalCalendar *calendar) { - g_autoptr (GcalCalendarMonitor) monitor = NULL; - g_assert (calendar != NULL && GCAL_IS_CALENDAR (calendar)); - g_assert (listener != NULL); - monitor = g_object_new (GCAL_TYPE_CALENDAR_MONITOR, - "calendar", calendar, - NULL); - - monitor->listener = listener; - monitor->listener_user_data = user_data; - - return g_steal_pointer (&monitor); + return g_object_new (GCAL_TYPE_CALENDAR_MONITOR, + "calendar", calendar, + NULL); } /** @@ -1531,3 +1501,4 @@ gcal_calendar_monitor_is_complete (GcalCalendarMonitor *self) return self->complete; } + diff --git a/src/core/gcal-calendar-monitor.h b/src/core/gcal-calendar-monitor.h index 6a6c2138..fb8577c9 100644 --- a/src/core/gcal-calendar-monitor.h +++ b/src/core/gcal-calendar-monitor.h @@ -30,24 +30,7 @@ G_BEGIN_DECLS #define GCAL_TYPE_CALENDAR_MONITOR (gcal_calendar_monitor_get_type()) G_DECLARE_FINAL_TYPE (GcalCalendarMonitor, gcal_calendar_monitor, GCAL, CALENDAR_MONITOR, GObject) -typedef struct { - void (*add_events) (GcalCalendarMonitor *self, - GPtrArray *events, - gpointer user_data); - - void (*update_events) (GcalCalendarMonitor *self, - GPtrArray *old_events, - GPtrArray *events, - gpointer user_data); - - void (*remove_events) (GcalCalendarMonitor *self, - GPtrArray *events, - gpointer user_data); -} GcalCalendarMonitorListener; - -GcalCalendarMonitor* gcal_calendar_monitor_new (GcalCalendar *calendar, - const GcalCalendarMonitorListener *listener, - gpointer user_data); +GcalCalendarMonitor* gcal_calendar_monitor_new (GcalCalendar *calendar); void gcal_calendar_monitor_set_range (GcalCalendarMonitor *self, GcalRange *range); diff --git a/src/core/gcal-shell-search-provider.c b/src/core/gcal-shell-search-provider.c index ae7d26dc..e4d57500 100644 --- a/src/core/gcal-shell-search-provider.c +++ b/src/core/gcal-shell-search-provider.c @@ -439,25 +439,6 @@ gcal_shell_search_provider_get_range (GcalTimelineSubscriber *subscriber) return gcal_range_new (self->range_start, self->range_end, GCAL_RANGE_DEFAULT); } -static void -gcal_shell_search_provider_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_shell_search_provider_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - -static void -gcal_shell_search_provider_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - static void gcal_shell_search_provider_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -475,9 +456,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_shell_search_provider_get_range; - iface->add_event = gcal_shell_search_provider_add_event; - iface->update_event = gcal_shell_search_provider_update_event; - iface->remove_event = gcal_shell_search_provider_remove_event; iface->set_model = gcal_shell_search_provider_set_model; } diff --git a/src/core/gcal-timeline-subscriber.h b/src/core/gcal-timeline-subscriber.h index 52bd29da..ea5b804f 100644 --- a/src/core/gcal-timeline-subscriber.h +++ b/src/core/gcal-timeline-subscriber.h @@ -40,16 +40,6 @@ struct _GcalTimelineSubscriberInterface GcalRange* (*get_range) (GcalTimelineSubscriber *self); - void (*add_event) (GcalTimelineSubscriber *self, - GcalEvent *event); - - void (*update_event) (GcalTimelineSubscriber *self, - GcalEvent *old_event, - GcalEvent *event); - - void (*remove_event) (GcalTimelineSubscriber *self, - GcalEvent *event); - void (*set_model) (GcalTimelineSubscriber *self, GListModel *model); }; diff --git a/src/core/gcal-timeline.c b/src/core/gcal-timeline.c index a954fa44..9950b7f5 100644 --- a/src/core/gcal-timeline.c +++ b/src/core/gcal-timeline.c @@ -32,33 +32,6 @@ #include -#define BATCH_SIZE 5 - -typedef enum -{ - ADD_EVENT, - UPDATE_EVENT, - REMOVE_EVENT, -} QueueEvent; - -typedef struct -{ - GcalTimeline *timeline; - - QueueEvent queue_event; - - GcalTimelineSubscriber *subscriber; - GcalEvent *event; - GcalEvent *old_event; - gboolean update_range_tree; -} QueueData; - -typedef struct -{ - GSource parent; - GcalTimeline *timeline; -} TimelineSource; - struct _GcalTimeline { GObject parent_instance; @@ -76,13 +49,8 @@ struct _GcalTimeline GListModel *events_model; GHashTable *subscribers; /* GcalTimelineSubscriber* -> SubscriberData* */ - GcalRangeTree *subscriber_ranges; GCancellable *cancellable; - - GHashTable *queued_adds; - GQueue *event_queue; - GSource *timeline_source; }; G_DEFINE_TYPE (GcalTimeline, gcal_timeline, G_TYPE_OBJECT) @@ -169,104 +137,6 @@ subscriber_data_new (GcalTimeline *self, * Auxiliary methods */ -static gchar* -format_subscriber_event_id (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ - return g_strdup_printf ("%s:%s", G_OBJECT_TYPE_NAME (subscriber), gcal_event_get_uid (event)); -} - -static QueueData * -queue_data_new (GcalTimeline *timeline, - QueueEvent queue_event, - GcalTimelineSubscriber *subscriber, - GcalEvent *event, - GcalEvent *old_event, - gboolean update_range_tree) -{ - QueueData *queue_data = g_new0 (QueueData, 1); - - queue_data->timeline = timeline; - queue_data->queue_event = queue_event; - queue_data->subscriber = subscriber ? g_object_ref (subscriber) : NULL; - queue_data->event = event ? g_object_ref (event) : NULL; - queue_data->old_event = old_event ? g_object_ref (old_event) : NULL; - queue_data->update_range_tree = update_range_tree; - - return queue_data; -} - -static void -queue_data_free (QueueData *queue_data) -{ - g_clear_object (&queue_data->subscriber); - g_clear_object (&queue_data->old_event); - g_clear_object (&queue_data->event); - g_free (queue_data); -} - -static void -queue_event_data (GcalTimeline *self, - QueueEvent queue_event, - GcalTimelineSubscriber *subscriber, - GcalEvent *event, - GcalEvent *old_event, - gboolean update_range_tree) -{ - g_autofree gchar *subscriber_event_id = NULL; - - if (subscriber) - { - subscriber_event_id = format_subscriber_event_id (subscriber, event); - - switch (queue_event) - { - case ADD_EVENT: - case UPDATE_EVENT: - break; - case REMOVE_EVENT: - { - GList *queued_add_link; - - queued_add_link = g_hash_table_lookup (self->queued_adds, subscriber_event_id); - if (queued_add_link) - { - QueueData *queued_add = queued_add_link->data; - - GCAL_TRACE_MSG ("Removing ADD_EVENT for event '%s' (%s) from event queue", - gcal_event_get_summary (event), - subscriber_event_id); - - g_hash_table_remove (self->queued_adds, subscriber_event_id); - g_queue_delete_link (self->event_queue, queued_add_link); - queue_data_free (queued_add); - return; - } - } - break; - } - } - - g_queue_push_tail (self->event_queue, - queue_data_new (self, queue_event, subscriber, event, old_event, update_range_tree)); - - if (subscriber) - { - switch (queue_event) - { - case ADD_EVENT: - g_hash_table_insert (self->queued_adds, - g_steal_pointer (&subscriber_event_id), - g_queue_peek_tail_link (self->event_queue)); - break; - - case UPDATE_EVENT: - case REMOVE_EVENT: - break; - } - } -} - static void update_completed_calendars (GcalTimeline *self) { @@ -299,42 +169,6 @@ update_completed_calendars (GcalTimeline *self) GCAL_EXIT; } -static void -add_event_to_subscriber (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ - GCAL_TRACE_MSG ("Adding event %s to subscriber %s", - gcal_event_get_uid (event), - G_OBJECT_TYPE_NAME (subscriber)); - - GCAL_TIMELINE_SUBSCRIBER_GET_IFACE (subscriber)->add_event (subscriber, event); -} - -static void -update_subscriber_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ - GCAL_TRACE_MSG ("Updating event '%s' (%s) at subscriber %s", - gcal_event_get_summary (event), - gcal_event_get_uid (event), - G_OBJECT_TYPE_NAME (subscriber)); - - GCAL_TIMELINE_SUBSCRIBER_GET_IFACE (subscriber)->update_event (subscriber, old_event, event); -} - -static void -remove_event_from_subscriber (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ - GCAL_TRACE_MSG ("Removing event '%s' (%s) from subscriber %s", - gcal_event_get_summary (event), - gcal_event_get_uid (event), - G_OBJECT_TYPE_NAME (subscriber)); - - GCAL_TIMELINE_SUBSCRIBER_GET_IFACE (subscriber)->remove_event (subscriber, event); -} - static void set_model_on_subscriber (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -414,155 +248,6 @@ update_range (GcalTimeline *self) GCAL_EXIT; } -static void -calculate_changed_events (GcalTimeline *self, - GcalTimelineSubscriber *subscriber, - GcalRange *old_range, - GcalRange *new_range) -{ - g_autoptr (GPtrArray) events_to_remove = NULL; - g_autoptr (GPtrArray) events_to_add = NULL; - GcalRangeOverlap overlap; - gint range_diff; - gint i; - - overlap = gcal_range_calculate_overlap (new_range, old_range, NULL); - - if (overlap == GCAL_RANGE_NO_OVERLAP) - { - GCAL_TRACE_MSG ("Ranges don't overlap, doing a full cleanup"); - - events_to_remove = gcal_range_tree_get_data_at_range (self->events, old_range); - events_to_add = gcal_range_tree_get_data_at_range (self->events, new_range); - } - else - { - g_autoptr (GDateTime) old_range_start = NULL; - g_autoptr (GDateTime) old_range_end = NULL; - g_autoptr (GDateTime) new_range_start = NULL; - g_autoptr (GDateTime) new_range_end = NULL; - - GCAL_TRACE_MSG ("Ranges overlap, doing a diff"); - - events_to_add = g_ptr_array_new (); - events_to_remove = g_ptr_array_new (); - - old_range_start = gcal_range_get_start (old_range); - old_range_end = gcal_range_get_end (old_range); - new_range_start = gcal_range_get_start (new_range); - new_range_end = gcal_range_get_end (new_range); - - /* Start ranges diff */ - range_diff = g_date_time_compare (old_range_start, new_range_start); - if (range_diff != 0) - { - g_autoptr (GPtrArray) events = NULL; - - if (range_diff < 0) - { - g_autoptr (GcalRange) range = gcal_range_new (old_range_start, new_range_start, GCAL_RANGE_DEFAULT); - - /* Removed */ - events = gcal_range_tree_get_data_at_range (self->events, range); - if (events) - g_ptr_array_extend (events_to_remove, events, NULL, NULL); - } - else if (range_diff > 0) - { - g_autoptr (GcalRange) range = gcal_range_new (new_range_start, old_range_start, GCAL_RANGE_DEFAULT); - - /* Added */ - events = gcal_range_tree_get_data_at_range (self->events, range); - if (events) - g_ptr_array_extend (events_to_add, events, NULL, NULL); - } - } - - /* End ranges diff */ - range_diff = g_date_time_compare (old_range_end, new_range_end); - if (range_diff != 0) - { - g_autoptr (GPtrArray) events = NULL; - - if (range_diff < 0) - { - g_autoptr (GcalRange) range = gcal_range_new (old_range_end, new_range_end, GCAL_RANGE_DEFAULT); - - events = gcal_range_tree_get_data_at_range (self->events, range); - if (events) - g_ptr_array_extend (events_to_add, events, NULL, NULL); - } - else if (range_diff > 0) - { - g_autoptr (GcalRange) range = gcal_range_new (new_range_end, old_range_end, GCAL_RANGE_DEFAULT); - - events = gcal_range_tree_get_data_at_range (self->events, range); - if (events) - g_ptr_array_extend (events_to_remove, events, NULL, NULL); - } - } - } - - for (i = 0; events_to_remove && i < events_to_remove->len; i++) - { - GcalEvent *event = g_ptr_array_index (events_to_remove, i); - /* Do not re-remove multiday events that are part of new range */ - if (gcal_event_is_multiday (event) && gcal_event_overlaps (event, new_range)) - continue; - - GCAL_TRACE_MSG ("Removing event from subscriber %s due to time range change (event: '%s' (%s))", - G_OBJECT_TYPE_NAME (subscriber), - gcal_event_get_summary (event), - gcal_event_get_uid (event)); - - queue_event_data (self, REMOVE_EVENT, subscriber, event, NULL, FALSE); - } - - for (i = 0; events_to_add && i < events_to_add->len; i++) - { - GcalEvent *event = g_ptr_array_index (events_to_add, i); - /* Do not re-add multiday events that were part of old range */ - if (gcal_event_is_multiday (event) && gcal_event_overlaps (event, old_range)) - continue; - - GCAL_TRACE_MSG ("Queueing event addition for subscriber %s (event: '%s' (%s))", - G_OBJECT_TYPE_NAME (subscriber), - gcal_event_get_summary (event), - gcal_event_get_uid (event)); - - queue_event_data (self, ADD_EVENT, subscriber, event, NULL, FALSE); - } -} - -static void -add_cached_events_to_subscriber (GcalTimeline *self, - GcalTimelineSubscriber *subscriber) -{ - g_autoptr (GcalRange) subscriber_range = NULL; - g_autoptr (GPtrArray) events_to_add = NULL; - gint i; - - GCAL_ENTRY; - - subscriber_range = gcal_timeline_subscriber_get_range (subscriber); - - events_to_add = gcal_range_tree_get_data_at_range (self->events, subscriber_range); - - for (i = 0; events_to_add && i < events_to_add->len; i++) - { - GcalEvent *event = g_ptr_array_index (events_to_add, i); - - GCAL_TRACE_MSG ("Queueing event addition for subscriber %s (event: '%s' (%s))", - G_OBJECT_TYPE_NAME (subscriber), - gcal_event_get_summary (event), - gcal_event_get_uid (event)); - - queue_event_data (self, ADD_EVENT, subscriber, event, NULL, FALSE); - } - - GCAL_EXIT; -} - static void update_subscriber_range (GcalTimeline *self, GcalTimelineSubscriber *subscriber) @@ -581,13 +266,6 @@ update_subscriber_range (GcalTimeline *self, new_range = gcal_timeline_subscriber_get_range (subscriber); - /* Diff new and old event ranges */ - calculate_changed_events (self, subscriber, old_range, new_range); - - /* Update the subscriber range */ - gcal_range_tree_remove_data (self->subscriber_ranges, subscriber); - gcal_range_tree_add_range (self->subscriber_ranges, new_range, subscriber); - subscriber_data->range = gcal_range_ref (new_range); g_assert (old_range != NULL); @@ -633,145 +311,6 @@ update_calendar_monitor_filters (GcalTimeline *self) gcal_calendar_monitor_set_filter (monitor, self->filter); } -/* - * GcalCalendarMonitorListener events - */ - -static void -calendar_monitor_add_events_cb (GcalCalendarMonitor *monitor, - GPtrArray *events, - gpointer user_data) -{ - GcalTimeline *self; - - GCAL_ENTRY; - - self = GCAL_TIMELINE (user_data); - - for (guint i = 0; i < events->len; i++) - { - g_autoptr (GPtrArray) subscribers_at_range = NULL; - GcalRange *event_range; - GcalEvent *event; - - event = g_ptr_array_index (events, i); - event_range = gcal_event_get_range (event); - - /* Add to all subscribers within the event range */ - subscribers_at_range = gcal_range_tree_get_data_at_range (self->subscriber_ranges, event_range); - - queue_event_data (self, ADD_EVENT, NULL, event, NULL, TRUE); - - for (guint j = 0; subscribers_at_range && j < subscribers_at_range->len; j++) - { - GcalTimelineSubscriber *subscriber = g_ptr_array_index (subscribers_at_range, j); - - queue_event_data (self, ADD_EVENT, subscriber, event, NULL, FALSE); - } - } - - GCAL_EXIT; -} - -static void -calendar_monitor_update_events_cb (GcalCalendarMonitor *monitor, - GPtrArray *old_events, - GPtrArray *events, - gpointer user_data) -{ - GcalTimeline *self; - - GCAL_ENTRY; - - g_assert (old_events->len == events->len); - - self = GCAL_TIMELINE (user_data); - - for (guint i = 0; i < events->len; i++) - { - g_autoptr (GPtrArray) old_subscribers_at_range = NULL; - g_autoptr (GPtrArray) subscribers_at_range = NULL; - GcalRange *event_range; - GcalRange *old_event_range; - GcalEvent *old_event; - GcalEvent *event; - - event = g_ptr_array_index (events, i); - old_event = g_ptr_array_index (old_events, i); - event_range = gcal_event_get_range (event); - old_event_range = gcal_event_get_range (old_event); - - /* Add to all subscribers within the event range */ - subscribers_at_range = gcal_range_tree_get_data_at_range (self->subscriber_ranges, event_range); - old_subscribers_at_range = gcal_range_tree_get_data_at_range (self->subscriber_ranges, old_event_range); - - for (guint j = 0; old_subscribers_at_range && j < old_subscribers_at_range->len; j++) - { - GcalTimelineSubscriber *old_subscriber = g_ptr_array_index (old_subscribers_at_range, j); - - if (!g_ptr_array_find (subscribers_at_range, old_subscriber, NULL)) - queue_event_data (self, REMOVE_EVENT, old_subscriber, old_event, NULL, FALSE); - } - - queue_event_data (self, UPDATE_EVENT, NULL, event, old_event, TRUE); - - for (guint j = 0; subscribers_at_range && j < subscribers_at_range->len; j++) - { - GcalTimelineSubscriber *subscriber = g_ptr_array_index (subscribers_at_range, j); - - if (g_ptr_array_find (old_subscribers_at_range, subscriber, NULL)) - queue_event_data (self, UPDATE_EVENT, subscriber, event, old_event, FALSE); - else - queue_event_data (self, ADD_EVENT, subscriber, event, NULL, FALSE); - } - - } - - GCAL_EXIT; -} - -static void -calendar_monitor_remove_events_cb (GcalCalendarMonitor *monitor, - GPtrArray *events, - gpointer user_data) -{ - GcalTimeline *self; - - GCAL_ENTRY; - - self = GCAL_TIMELINE (user_data); - - for (guint i = 0; i < events->len; i++) - { - g_autoptr (GPtrArray) subscribers_at_range = NULL; - GcalRange *event_range; - GcalEvent *event; - - event = g_ptr_array_index (events, i); - event_range = gcal_event_get_range (event); - - /* Add to all subscribers within the event range */ - subscribers_at_range = gcal_range_tree_get_data_at_range (self->subscriber_ranges, event_range); - - for (guint j = 0; subscribers_at_range && j < subscribers_at_range->len; j++) - { - GcalTimelineSubscriber *subscriber = g_ptr_array_index (subscribers_at_range, j); - - queue_event_data (self, REMOVE_EVENT, subscriber, event, NULL, FALSE); - } - - queue_event_data (self, REMOVE_EVENT, NULL, event, NULL, TRUE); - } - - GCAL_EXIT; -} - -static const GcalCalendarMonitorListener monitor_listener = { - calendar_monitor_add_events_cb, - calendar_monitor_update_events_cb, - calendar_monitor_remove_events_cb, -}; - /* * Callbacks @@ -817,130 +356,6 @@ on_subscriber_range_changed_cb (GcalTimelineSubscriber *subscriber, self->update_range_idle_id = g_idle_add (update_timeline_range_in_idle_cb, self); } -static gboolean -timeline_source_prepare (GSource *source, - gint *timeout) -{ - TimelineSource *timeline_source; - GcalTimeline *self; - - timeline_source = (TimelineSource*) source; - self = timeline_source->timeline; - - return self->event_queue->length > 0; -} - -static gboolean -timeline_source_dispatch (GSource *source, - GSourceFunc callback, - gpointer user_data) -{ - TimelineSource *timeline_source; - GcalTimeline *self; - gint processed_events; - - GCAL_ENTRY; - - processed_events = 0; - timeline_source = (TimelineSource*) source; - self = timeline_source->timeline; - - while (processed_events < BATCH_SIZE && !g_queue_is_empty (self->event_queue)) - { - GcalTimelineSubscriber *subscriber; - g_autofree gchar *subscriber_event_id = NULL; - GcalRange *event_range; - QueueData *queue_data; - GcalEvent *event; - - queue_data = g_queue_pop_head (self->event_queue); - - event = queue_data->event; - subscriber = queue_data->subscriber; - event_range = gcal_event_get_range (event); - - if (subscriber) - subscriber_event_id = format_subscriber_event_id (subscriber, event); - - /* The subscriber may have been removed already */ - if (subscriber && !g_hash_table_contains (self->subscribers, subscriber)) - { - g_hash_table_remove (self->queued_adds, subscriber_event_id); - queue_data_free (queue_data); - continue; - } - - switch (queue_data->queue_event) - { - case ADD_EVENT: - GCAL_TRACE_MSG ("Processing ADD_EVENT for event '%s' (%s) (in queued_adds: %d, update range tree: %d)", - gcal_event_get_summary (event), - gcal_event_get_uid (event), - subscriber_event_id && g_hash_table_contains (self->queued_adds, subscriber_event_id), - queue_data->update_range_tree); - - if (queue_data->update_range_tree) - gcal_range_tree_add_range (self->events, event_range, g_object_ref (event)); - - if (subscriber) - { - add_event_to_subscriber (subscriber, event); - g_hash_table_remove (self->queued_adds, subscriber_event_id); - } - break; - - case UPDATE_EVENT: - { - GCAL_TRACE_MSG ("Processing UPDATE_EVENT for event '%s' (%s) (update range tree: %d)", - gcal_event_get_summary (event), - gcal_event_get_uid (event), - queue_data->update_range_tree); - - if (queue_data->update_range_tree) - { - GcalRange *old_event_range; - - /* Remove the old event */ - old_event_range = gcal_event_get_range (queue_data->old_event); - - gcal_range_tree_remove_range (self->events, old_event_range, queue_data->old_event); - gcal_range_tree_add_range (self->events, event_range, g_object_ref (event)); - } - - if (subscriber) - update_subscriber_event (subscriber, queue_data->old_event, event); - } - break; - - case REMOVE_EVENT: - GCAL_TRACE_MSG ("Processing REMOVE_EVENT for event '%s' (%s) (update range tree: %d)", - gcal_event_get_summary (event), - gcal_event_get_uid (event), - queue_data->update_range_tree); - - if (subscriber) - remove_event_from_subscriber (subscriber, event); - - if (queue_data->update_range_tree) - gcal_range_tree_remove_range (self->events, event_range, event); - break; - } - - queue_data_free (queue_data); - - processed_events++; - } - - GCAL_RETURN (G_SOURCE_CONTINUE); -} - -static GSourceFuncs timeline_source_funcs = -{ - timeline_source_prepare, - NULL, - timeline_source_dispatch, - NULL, -}; /* * GObject overrides @@ -959,17 +374,6 @@ gcal_timeline_finalize (GObject *object) g_clear_pointer (&self->events, gcal_range_tree_unref); g_clear_pointer (&self->calendars, g_hash_table_destroy); g_clear_pointer (&self->subscribers, g_hash_table_destroy); - g_clear_pointer (&self->queued_adds, g_hash_table_destroy); - g_clear_pointer (&self->subscriber_ranges, gcal_range_tree_unref); - - g_source_destroy (self->timeline_source); - g_clear_pointer (&self->timeline_source, g_source_unref); - - if (self->event_queue) - { - g_queue_free_full (self->event_queue, (GDestroyNotify) queue_data_free); - self->event_queue = NULL; - } G_OBJECT_CLASS (gcal_timeline_parent_class)->finalize (object); } @@ -1053,27 +457,13 @@ gcal_timeline_class_init (GcalTimelineClass *klass) static void gcal_timeline_init (GcalTimeline *self) { - TimelineSource *timeline_source; - self->cancellable = g_cancellable_new (); self->events = gcal_range_tree_new_with_free_func (g_object_unref); self->calendars = g_hash_table_new_full (NULL, NULL, NULL, g_object_unref); self->subscribers = g_hash_table_new_full (NULL, NULL, g_object_unref, (GDestroyNotify) subscriber_data_free); - self->subscriber_ranges = gcal_range_tree_new (); - self->event_queue = g_queue_new (); - self->queued_adds = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); self->calendar_monitors = g_list_store_new (GCAL_TYPE_CALENDAR_MONITOR); self->events_model = G_LIST_MODEL (gtk_flatten_list_model_new (g_object_ref (G_LIST_MODEL (self->calendar_monitors)))); - - /* Timeline source */ - timeline_source = (TimelineSource*) g_source_new (&timeline_source_funcs, sizeof (TimelineSource)); - timeline_source->timeline = self; - - self->timeline_source = (GSource*) timeline_source; - g_source_set_name (self->timeline_source, "Timeline Source"); - g_source_set_priority (self->timeline_source, G_PRIORITY_DEFAULT_IDLE); - g_source_attach (self->timeline_source, g_main_context_default ()); } /** @@ -1115,7 +505,7 @@ gcal_timeline_add_calendar (GcalTimeline *self, GCAL_TRACE_MSG ("Adding calendar '%s' to timeline %p", gcal_calendar_get_name (calendar), self); - monitor = gcal_calendar_monitor_new (calendar, &monitor_listener, self); + monitor = gcal_calendar_monitor_new (calendar); g_signal_connect (monitor, "notify::complete", G_CALLBACK (on_calendar_monitor_completed_cb), self); g_hash_table_insert (self->calendars, calendar, g_object_ref (monitor)); g_list_store_append (self->calendar_monitors, monitor); @@ -1185,7 +575,6 @@ gcal_timeline_add_subscriber (GcalTimeline *self, self, 0); - add_cached_events_to_subscriber (self, subscriber); update_subscriber_range (self, subscriber); update_range (self); @@ -1208,7 +597,6 @@ gcal_timeline_remove_subscriber (GcalTimeline *self, g_signal_handlers_disconnect_by_func (subscriber, on_subscriber_range_changed_cb, self); g_hash_table_remove (self->subscribers, subscriber); - gcal_range_tree_remove_data (self->subscriber_ranges, subscriber); update_range (self); GCAL_EXIT; diff --git a/src/gui/common/gcal-date-chooser.c b/src/gui/common/gcal-date-chooser.c index 46f48fff..c14cfdcb 100644 --- a/src/gui/common/gcal-date-chooser.c +++ b/src/gui/common/gcal-date-chooser.c @@ -686,25 +686,6 @@ gcal_date_chooser_get_range (GcalTimelineSubscriber *subscriber) return gcal_range_new (start, end, GCAL_RANGE_DEFAULT); } -static void -gcal_date_chooser_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_date_chooser_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_date_chooser_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - static void gcal_date_chooser_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -719,9 +700,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_date_chooser_get_range; - iface->add_event = gcal_date_chooser_add_event; - iface->remove_event = gcal_date_chooser_remove_event; - iface->update_event = gcal_date_chooser_update_event; iface->set_model = gcal_date_chooser_set_model; } diff --git a/src/gui/views/gcal-agenda-view.c b/src/gui/views/gcal-agenda-view.c index f1e02bc4..79455acc 100644 --- a/src/gui/views/gcal-agenda-view.c +++ b/src/gui/views/gcal-agenda-view.c @@ -318,25 +318,6 @@ gcal_agenda_view_get_range (GcalTimelineSubscriber *subscriber) GCAL_RANGE_DEFAULT); } -static void -gcal_agenda_view_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_agenda_view_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_agenda_view_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - static void gcal_agenda_view_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -361,9 +342,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_agenda_view_get_range; - iface->add_event = gcal_agenda_view_add_event; - iface->update_event = gcal_agenda_view_update_event; - iface->remove_event = gcal_agenda_view_remove_event; iface->set_model = gcal_agenda_view_set_model; } diff --git a/src/gui/views/gcal-month-view.c b/src/gui/views/gcal-month-view.c index 27e2fcd2..d4ed14c9 100644 --- a/src/gui/views/gcal-month-view.c +++ b/src/gui/views/gcal-month-view.c @@ -1253,25 +1253,6 @@ gcal_month_view_get_range (GcalTimelineSubscriber *subscriber) return gcal_range_union (first_row_range, last_row_range); } -static void -gcal_month_view_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_month_view_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_month_view_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - static void gcal_month_view_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -1296,9 +1277,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_month_view_get_range; - iface->add_event = gcal_month_view_add_event; - iface->update_event = gcal_month_view_update_event; - iface->remove_event = gcal_month_view_remove_event; iface->set_model = gcal_month_view_set_model; } diff --git a/src/gui/views/gcal-week-view.c b/src/gui/views/gcal-week-view.c index 993bee81..33304889 100644 --- a/src/gui/views/gcal-week-view.c +++ b/src/gui/views/gcal-week-view.c @@ -490,25 +490,6 @@ gcal_week_view_get_range (GcalTimelineSubscriber *subscriber) GCAL_RANGE_DEFAULT); } -static void -gcal_week_view_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_week_view_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - -static void -gcal_week_view_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - static void gcal_week_view_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -529,9 +510,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_week_view_get_range; - iface->add_event = gcal_week_view_add_event; - iface->update_event = gcal_week_view_update_event; - iface->remove_event = gcal_week_view_remove_event; iface->set_model = gcal_week_view_set_model; } diff --git a/src/search/gcal-search-model.c b/src/search/gcal-search-model.c index 7edc8b6b..78241302 100644 --- a/src/search/gcal-search-model.c +++ b/src/search/gcal-search-model.c @@ -146,25 +146,6 @@ gcal_search_model_get_range (GcalTimelineSubscriber *subscriber) return gcal_range_new (self->range_start, self->range_end, GCAL_RANGE_DEFAULT); } -static void -gcal_search_model_add_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - -static void -gcal_search_model_update_event (GcalTimelineSubscriber *subscriber, - GcalEvent *old_event, - GcalEvent *event) -{ -} - -static void -gcal_search_model_remove_event (GcalTimelineSubscriber *subscriber, - GcalEvent *event) -{ -} - static void gcal_search_model_set_model (GcalTimelineSubscriber *subscriber, GListModel *model) @@ -182,9 +163,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface) { iface->get_range = gcal_search_model_get_range; - iface->add_event = gcal_search_model_add_event; - iface->update_event = gcal_search_model_update_event; - iface->remove_event = gcal_search_model_remove_event; iface->set_model = gcal_search_model_set_model; }