From 462e8e6d8e46475ea3222056f65ff40823e9e0bf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 9 Mar 2014 22:26:26 -0500 Subject: don't connect to EDS when running in the greeter. --- src/planner-range.cpp | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) (limited to 'src/planner-range.cpp') diff --git a/src/planner-range.cpp b/src/planner-range.cpp index 13a1492..93946e0 100644 --- a/src/planner-range.cpp +++ b/src/planner-range.cpp @@ -27,22 +27,46 @@ namespace datetime { **** ***/ -RangePlanner::RangePlanner(): +SimpleRangePlanner::SimpleRangePlanner(const std::shared_ptr& engine, + const std::shared_ptr& timezone): + m_engine(engine), + m_timezone(timezone), m_range(std::pair(DateTime::NowLocal(), DateTime::NowLocal())) { + engine->changed().connect([this](){ + g_debug("RangePlanner %p rebuilding soon because Engine %p emitted 'changed' signal%p", this, m_engine.get()); + rebuild_soon(); + }); + range().changed().connect([this](const std::pair&){ g_debug("rebuilding because the date range changed"); rebuild_soon(); }); } -RangePlanner::~RangePlanner() +SimpleRangePlanner::~SimpleRangePlanner() { if (m_rebuild_tag) g_source_remove(m_rebuild_tag); } -void RangePlanner::rebuild_soon() +/*** +**** +***/ + +void SimpleRangePlanner::rebuild_now() +{ + const auto& r = range().get(); + + auto on_appointments_fetched = [this](const std::vector& a){ + g_debug("RangePlanner %p got %zu appointments", this, a.size()); + appointments().set(a); + }; + + m_engine->get_appointments(r.first, r.second, *m_timezone.get(), on_appointments_fetched); +} + +void SimpleRangePlanner::rebuild_soon() { static const int ARBITRARY_BATCH_MSEC = 200; @@ -50,15 +74,24 @@ void RangePlanner::rebuild_soon() m_rebuild_tag = g_timeout_add(ARBITRARY_BATCH_MSEC, rebuild_now_static, this); } -gboolean RangePlanner::rebuild_now_static(gpointer gself) +gboolean SimpleRangePlanner::rebuild_now_static(gpointer gself) { - auto self = static_cast(gself); + auto self = static_cast(gself); self->m_rebuild_tag = 0; self->rebuild_now(); return G_SOURCE_REMOVE; } -core::Property>& RangePlanner::range() +/*** +**** +***/ + +core::Property>& SimpleRangePlanner::appointments() +{ + return m_appointments; +} + +core::Property>& SimpleRangePlanner::range() { return m_range; } -- cgit v1.2.3