[gnome-calendar/gbsneto/range: 12/15] calendar-monitor: Use GcalRange

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 16c156914ae1a945507d87c3762b90f43773eb6c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon Apr 13 20:33:26 2020 -0300

    calendar-monitor: Use GcalRange

 src/core/gcal-calendar-monitor.c | 48 ++++++++++++++++---------------------
 src/core/gcal-calendar-monitor.h |  4 ++--
 src/core/gcal-timeline.c         | 51 ++++++++++++++++------------------------
 3 files changed, 42 insertions(+), 61 deletions(-)
---
diff --git a/src/core/gcal-calendar-monitor.c b/src/core/gcal-calendar-monitor.c
index 8bea3c07..7586417e 100644
--- a/src/core/gcal-calendar-monitor.c
+++ b/src/core/gcal-calendar-monitor.c
@@ -75,8 +75,7 @@ struct _GcalCalendarMonitor
    */
   struct {
     GMutex            mutex;
-    GDateTime        *range_start;
-    GDateTime        *range_end;
+    GcalRange        *range;
     gchar            *filter;
   } shared;
 };
@@ -114,12 +113,13 @@ static GParamSpec *properties [N_PROPS] = { NULL, };
  */
 
 static gchar*
-build_subscriber_filter (GDateTime   *range_start,
-                         GDateTime   *range_end,
+build_subscriber_filter (GcalRange   *range,
                          const gchar *filter)
 {
   g_autoptr (GDateTime) utc_range_start = NULL;
   g_autoptr (GDateTime) utc_range_end = NULL;
+  g_autoptr (GDateTime) range_start = NULL;
+  g_autoptr (GDateTime) range_end = NULL;
   g_autofree gchar *start_str = NULL;
   g_autofree gchar *end_str = NULL;
   g_autofree gchar *result = NULL;
@@ -129,9 +129,11 @@ build_subscriber_filter (GDateTime   *range_start,
    * g_date_time_format_iso8601().
    */
 
+  range_start = gcal_range_get_start (range);
   utc_range_start = g_date_time_to_utc (range_start);
   start_str = g_date_time_format (utc_range_start, "%Y%m%dT%H%M%SZ");
 
+  range_end = gcal_range_get_end (range);
   utc_range_end = g_date_time_to_utc (range_end);
   end_str = g_date_time_format (utc_range_end, "%Y%m%dT%H%M%SZ");
 
@@ -173,7 +175,7 @@ get_monitor_ranges (GcalCalendarMonitor  *self)
   g_autoptr (GcalRange) range = NULL;
 
   g_mutex_lock (&self->shared.mutex);
-  range = gcal_range_new (self->shared.range_start, self->shared.range_end, GCAL_RANGE_DEFAULT);
+  range = gcal_range_copy (self->shared.range);
   g_mutex_unlock (&self->shared.mutex);
 
   return g_steal_pointer (&range);
@@ -608,13 +610,13 @@ create_view (GcalCalendarMonitor *self)
   g_assert (self->cancellable == NULL);
   self->cancellable = g_cancellable_new ();
 
-  if (!self->shared.range_start || !self->shared.range_end)
+  if (!self->shared.range)
     {
       g_mutex_unlock (&self->shared.mutex);
       GCAL_RETURN ();
     }
 
-  filter = build_subscriber_filter (self->shared.range_start, self->shared.range_end, self->shared.filter);
+  filter = build_subscriber_filter (self->shared.range, self->shared.filter);
 
   g_mutex_unlock (&self->shared.mutex);
 
@@ -813,7 +815,7 @@ maybe_spawn_view_thread (GcalCalendarMonitor *self)
 {
   g_autofree gchar *thread_name = NULL;
 
-  if (self->thread || !self->shared.range_start || !self->shared.range_end)
+  if (self->thread || !self->shared.range)
     return;
 
   thread_name = g_strdup_printf ("GcalCalendarMonitor (%s)", gcal_calendar_get_id (self->calendar));
@@ -824,18 +826,13 @@ maybe_spawn_view_thread (GcalCalendarMonitor *self)
 
 static void
 remove_events_outside_range (GcalCalendarMonitor *self,
-                             GDateTime           *range_start,
-                             GDateTime           *range_end)
+                             GcalRange           *range)
 {
-  g_autoptr (GcalRange) range = NULL;
   GHashTableIter iter;
   GcalEvent *event;
 
   GCAL_TRACE_MSG ("Removing events outside range from monitor");
 
-  if (range_start && range_end)
-    range = gcal_range_new (range_start, range_end, GCAL_RANGE_DEFAULT);
-
   g_hash_table_iter_init (&iter, self->events);
   while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &event))
     {
@@ -1006,8 +1003,7 @@ gcal_calendar_monitor_finalize (GObject *object)
   g_clear_pointer (&self->main_context, g_main_context_unref);
   g_clear_pointer (&self->messages, g_async_queue_unref);
   g_clear_pointer (&self->shared.filter, g_free);
-  gcal_clear_date_time (&self->shared.range_start);
-  gcal_clear_date_time (&self->shared.range_end);
+  g_clear_pointer (&self->shared.range, gcal_range_unref);
 
   G_OBJECT_CLASS (gcal_calendar_monitor_parent_class)->finalize (object);
 }
@@ -1125,8 +1121,7 @@ gcal_calendar_monitor_new (GcalCalendar *calendar)
 /**
  * gcal_calendar_monitor_set_range:
  * @self: a #GcalCalendarMonitor
- * @range_start: new range start
- * @range_end: new range end
+ * @range: a #GcalRange
  *
  * Updates the range of @self. This usually will result in
  * @self creating a new view, and gathering the events from
@@ -1134,23 +1129,20 @@ gcal_calendar_monitor_new (GcalCalendar *calendar)
  */
 void
 gcal_calendar_monitor_set_range (GcalCalendarMonitor *self,
-                                 GDateTime           *range_start,
-                                 GDateTime           *range_end)
+                                 GcalRange           *range)
 {
   gboolean range_changed;
 
   g_return_if_fail (GCAL_IS_CALENDAR_MONITOR (self));
-  g_return_if_fail ((!range_start && !range_end) || g_date_time_compare (range_start, range_end) < 0);
 
   GCAL_ENTRY;
 
   g_mutex_lock (&self->shared.mutex);
 
   range_changed =
-    !self->shared.range_start ||
-    !self->shared.range_end ||
-    (self->shared.range_start && range_start && g_date_time_compare (self->shared.range_start, range_start) 
!= 0) ||
-    (self->shared.range_end && range_end && g_date_time_compare (self->shared.range_end, range_end) != 0);
+    !self->shared.range ||
+    !range ||
+    gcal_range_calculate_overlap (self->shared.range, range, NULL) != GCAL_RANGE_EQUAL;
 
   if (!range_changed)
     {
@@ -1158,13 +1150,13 @@ gcal_calendar_monitor_set_range (GcalCalendarMonitor *self,
       GCAL_RETURN ();
     }
 
-  gcal_set_date_time (&self->shared.range_start, range_start);
-  gcal_set_date_time (&self->shared.range_end, range_end);
+  g_clear_pointer (&self->shared.range, gcal_range_unref);
+  self->shared.range = range ? gcal_range_copy (range) : NULL;
 
   g_mutex_unlock (&self->shared.mutex);
 
   maybe_spawn_view_thread (self);
-  remove_events_outside_range (self, range_start, range_end);
+  remove_events_outside_range (self, range);
 
   g_cancellable_cancel (self->cancellable);
 
diff --git a/src/core/gcal-calendar-monitor.h b/src/core/gcal-calendar-monitor.h
index b2cb94d0..402569a3 100644
--- a/src/core/gcal-calendar-monitor.h
+++ b/src/core/gcal-calendar-monitor.h
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 
 #include "gcal-types.h"
+#include "gcal-range.h"
 
 G_BEGIN_DECLS
 
@@ -32,8 +33,7 @@ G_DECLARE_FINAL_TYPE (GcalCalendarMonitor, gcal_calendar_monitor, GCAL, CALENDAR
 GcalCalendarMonitor* gcal_calendar_monitor_new                   (GcalCalendar        *calendar);
 
 void                 gcal_calendar_monitor_set_range             (GcalCalendarMonitor *self,
-                                                                  GDateTime           *range_start,
-                                                                  GDateTime           *range_end);
+                                                                  GcalRange           *range);
 
 GcalEvent*           gcal_calendar_monitor_get_cached_event      (GcalCalendarMonitor  *self,
                                                                   const gchar          *event_id);
diff --git a/src/core/gcal-timeline.c b/src/core/gcal-timeline.c
index 160eb0eb..5038538b 100644
--- a/src/core/gcal-timeline.c
+++ b/src/core/gcal-timeline.c
@@ -62,8 +62,7 @@ struct _GcalTimeline
   GObject             parent_instance;
 
   gulong              update_range_idle_id;
-  GDateTime          *range_start;
-  GDateTime          *range_end;
+  GcalRange          *range;
 
   GcalRangeTree      *events;
   gchar              *filter;
@@ -205,8 +204,6 @@ subscriber_contains_event (GcalTimelineSubscriber *subscriber,
 static void
 update_range (GcalTimeline *self)
 {
-  g_autoptr (GDateTime) new_range_start = NULL;
-  g_autoptr (GDateTime) new_range_end = NULL;
   GcalTimelineSubscriber *subscriber;
   GHashTableIter iter;
   gboolean has_subscribers;
@@ -219,49 +216,40 @@ update_range (GcalTimeline *self)
 
   if (has_subscribers)
     {
+      g_autoptr (GcalRange) new_range = NULL;
+
       g_hash_table_iter_init (&iter, self->subscribers);
       while (g_hash_table_iter_next (&iter, (gpointer*) &subscriber, NULL))
         {
           g_autoptr (GcalRange) subscriber_range = NULL;
-          g_autoptr (GDateTime) subscriber_start = NULL;
-          g_autoptr (GDateTime) subscriber_end = NULL;
+          g_autoptr (GcalRange) union_range = NULL;
 
           subscriber_range = gcal_timeline_subscriber_get_range (subscriber);
-          subscriber_start = gcal_range_get_start (subscriber_range);
-          subscriber_end = gcal_range_get_end (subscriber_range);
 
-          if (!new_range_start || g_date_time_compare (subscriber_start, new_range_start) < 0)
+          if (new_range)
             {
-              gcal_clear_date_time (&new_range_start);
-              new_range_start = g_steal_pointer (&subscriber_start);
-            }
+              union_range = gcal_range_union (subscriber_range, new_range);
 
-          if (!new_range_end || g_date_time_compare (subscriber_end, new_range_end) > 0)
+              g_clear_pointer (&new_range, gcal_range_unref);
+              new_range = g_steal_pointer (&union_range);
+            }
+          else
             {
-              gcal_clear_date_time (&new_range_end);
-              new_range_end = g_steal_pointer (&subscriber_end);
+              new_range = g_steal_pointer (&subscriber_range);
             }
         }
 
-      if (!self->range_start || g_date_time_compare (self->range_start, new_range_start) != 0)
-        {
-          gcal_clear_date_time (&self->range_start);
-          self->range_start = g_steal_pointer (&new_range_start);
-          range_changed = TRUE;
-        }
-
-      if (!self->range_end || g_date_time_compare (self->range_end, new_range_end) != 0)
+      if (!self->range || gcal_range_compare (self->range, new_range) != 0)
         {
-          gcal_clear_date_time (&self->range_end);
-          self->range_end = g_steal_pointer (&new_range_end);
+          g_clear_pointer (&self->range, gcal_range_unref);
+          self->range = g_steal_pointer (&new_range);
           range_changed = TRUE;
         }
 
     }
-  else if (self->range_start || self->range_end)
+  else if (self->range)
     {
-      gcal_clear_date_time (&self->range_start);
-      gcal_clear_date_time (&self->range_end);
+      g_clear_pointer (&self->range, gcal_range_unref);
       range_changed = TRUE;
     }
 
@@ -273,7 +261,7 @@ update_range (GcalTimeline *self)
 
       g_hash_table_iter_init (&iter, self->calendars);
       while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &monitor))
-        gcal_calendar_monitor_set_range (monitor, self->range_start, self->range_end);
+        gcal_calendar_monitor_set_range (monitor, self->range);
     }
 
   GCAL_EXIT;
@@ -446,6 +434,7 @@ update_subscriber_range (GcalTimeline           *self,
   gcal_range_tree_add_range (self->subscriber_ranges, new_range, subscriber);
 
   g_hash_table_insert (self->subscribers, g_object_ref (subscriber), g_steal_pointer (&new_range));
+  g_steal_pointer (&old_range);
 
   GCAL_EXIT;
 }
@@ -884,8 +873,8 @@ gcal_timeline_add_calendar (GcalTimeline *self,
   g_signal_connect (monitor, "completed", G_CALLBACK (on_calendar_monitor_completed_cb), self);
   g_hash_table_insert (self->calendars, calendar, g_object_ref (monitor));
 
-  if (self->range_start && self->range_end)
-    gcal_calendar_monitor_set_range (monitor, self->range_start, self->range_end);
+  if (self->range)
+    gcal_calendar_monitor_set_range (monitor, self->range);
 
   GCAL_EXIT;
 }