aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/datetime/planner-aggregate.h52
-rw-r--r--include/datetime/planner-snooze.h56
-rw-r--r--include/datetime/planner.h3
-rw-r--r--src/planner-aggregate.cpp106
-rw-r--r--src/planner-snooze.cpp115
-rw-r--r--src/planner.cpp88
6 files changed, 420 insertions, 0 deletions
diff --git a/include/datetime/planner-aggregate.h b/include/datetime/planner-aggregate.h
new file mode 100644
index 0000000..eeca9b7
--- /dev/null
+++ b/include/datetime/planner-aggregate.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_PLANNER_AGGREGATE_H
+#define INDICATOR_DATETIME_PLANNER_AGGREGATE_H
+
+#include <datetime/planner.h>
+
+#include <memory>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief Aggregates one or more Planners
+ */
+class AggregatePlanner: public Planner
+{
+public:
+ AggregatePlanner();
+ virtual ~AggregatePlanner();
+ void add(const std::shared_ptr<Planner>&);
+
+ core::Property<std::vector<Appointment>>& appointments();
+
+protected:
+ class Impl;
+ std::unique_ptr<Impl> impl;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_PLANNER_AGGREGATE_H
diff --git a/include/datetime/planner-snooze.h b/include/datetime/planner-snooze.h
new file mode 100644
index 0000000..889c4f8
--- /dev/null
+++ b/include/datetime/planner-snooze.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_PLANNER_SNOOZE_H
+#define INDICATOR_DATETIME_PLANNER_SNOOZE_H
+
+#include <datetime/clock.h>
+#include <datetime/planner.h>
+#include <datetime/settings.h>
+
+#include <memory>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * A planner to hold 'Snooze' copies of other appointments
+ */
+class SnoozePlanner: public Planner
+{
+public:
+ SnoozePlanner(const std::shared_ptr<Settings>&,
+ const std::shared_ptr<Clock>&);
+ ~SnoozePlanner();
+ void add(const Appointment&);
+
+ core::Property<std::vector<Appointment>>& appointments();
+
+protected:
+ class Impl;
+ friend class Impl;
+ std::unique_ptr<Impl> impl;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_PLANNER_H
diff --git a/include/datetime/planner.h b/include/datetime/planner.h
index e6ef927..43991ec 100644
--- a/include/datetime/planner.h
+++ b/include/datetime/planner.h
@@ -38,10 +38,13 @@ class Planner
{
public:
virtual ~Planner() =default;
+
virtual core::Property<std::vector<Appointment>>& appointments() =0;
protected:
Planner() =default;
+ static void sort(std::vector<Appointment>&);
+ static void trim(std::vector<Appointment>&, const DateTime& begin, const DateTime& end);
};
} // namespace datetime
diff --git a/src/planner-aggregate.cpp b/src/planner-aggregate.cpp
new file mode 100644
index 0000000..7458f0c
--- /dev/null
+++ b/src/planner-aggregate.cpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include <datetime/planner-aggregate.h>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/***
+****
+***/
+
+class AggregatePlanner::Impl
+{
+public:
+ Impl(AggregatePlanner* owner):
+ m_owner(owner)
+ {
+ }
+
+ ~Impl() =default;
+
+ core::Property<std::vector<Appointment>>& appointments()
+ {
+ return m_appointments;
+ }
+
+ void add(const std::shared_ptr<Planner>& planner)
+ {
+ m_planners.push_back(planner);
+
+ auto on_changed = [this](const std::vector<Appointment>&){rebuild();};
+ auto connection = planner->appointments().changed().connect(on_changed);
+ m_connections.push_back(connection);
+ }
+
+private:
+
+ void rebuild()
+ {
+ // use a sorted aggregate vector of all our planners
+ std::vector<Appointment> all;
+ for (const auto& planner : m_planners) {
+ const auto& walk = planner->appointments().get();
+ all.insert(std::end(all), std::begin(walk), std::end(walk));
+ }
+ m_owner->sort(all);
+ m_appointments.set(all);
+ }
+
+ const AggregatePlanner* m_owner = nullptr;
+ core::Property<std::vector<Appointment>> m_appointments;
+ std::vector<std::shared_ptr<Planner>> m_planners;
+ std::vector<core::ScopedConnection> m_connections;
+};
+
+/***
+****
+***/
+
+AggregatePlanner::AggregatePlanner():
+ impl(new Impl{this})
+{
+}
+
+AggregatePlanner::~AggregatePlanner()
+{
+}
+
+core::Property<std::vector<Appointment>>&
+AggregatePlanner::appointments()
+{
+ return impl->appointments();
+}
+
+void
+AggregatePlanner::add(const std::shared_ptr<Planner>& planner)
+{
+ return impl->add(planner);
+}
+
+/***
+****
+***/
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
diff --git a/src/planner-snooze.cpp b/src/planner-snooze.cpp
new file mode 100644
index 0000000..6d427ca
--- /dev/null
+++ b/src/planner-snooze.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include <datetime/planner-snooze.h>
+
+#include <libedataserver/libedataserver.h> // e_uid_new()
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/***
+****
+***/
+
+class SnoozePlanner::Impl
+{
+public:
+
+ Impl(SnoozePlanner* owner,
+ const std::shared_ptr<Settings>& settings,
+ const std::shared_ptr<Clock>& clock):
+ m_owner(owner),
+ m_settings(settings),
+ m_clock(clock)
+ {
+ }
+
+ ~Impl()
+ {
+ }
+
+ virtual core::Property<std::vector<Appointment>>& appointments()
+ {
+ return m_appointments;
+ }
+
+ void add(const Appointment& appt_in)
+ {
+ Appointment appt = appt_in;
+
+ // adjust the time
+ const auto appt_length_secs = appt.end - appt.begin;
+ appt.begin = m_clock->localtime().add_full(0,0,0,0,m_settings->snooze_duration.get(),0);
+ appt.end = appt.begin.add_full(0,0,0,0,0,appt_length_secs);
+
+ // give it a new ID
+ gchar* uid = e_uid_new();
+ appt.uid = uid;
+ g_free(uid);
+
+ // add it to our appointment list
+ auto tmp = appointments().get();
+ tmp.push_back(appt);
+ m_owner->sort(tmp);
+ m_appointments.set(tmp);
+ }
+
+private:
+
+ const SnoozePlanner* const m_owner;
+ const std::shared_ptr<Settings> m_settings;
+ const std::shared_ptr<Clock> m_clock;
+ core::Property<std::vector<Appointment>> m_appointments;
+};
+
+/***
+****
+***/
+
+SnoozePlanner::SnoozePlanner(const std::shared_ptr<Settings>& settings,
+ const std::shared_ptr<Clock>& clock):
+ impl(new Impl{this, settings, clock})
+{
+}
+
+SnoozePlanner::~SnoozePlanner()
+{
+}
+
+void
+SnoozePlanner::add(const Appointment& appointment)
+{
+ impl->add(appointment);
+}
+
+core::Property<std::vector<Appointment>>&
+SnoozePlanner::appointments()
+{
+ return impl->appointments();
+}
+
+/***
+****
+***/
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
diff --git a/src/planner.cpp b/src/planner.cpp
new file mode 100644
index 0000000..3f73030
--- /dev/null
+++ b/src/planner.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#include <datetime/planner.h>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/***
+****
+***/
+
+Planner::Planner()
+{
+}
+
+Planner::~Planner()
+{
+}
+
+void
+Planner::set_range_to_calendar_month(const DateTime& dt)
+{
+ // use appointments that occur in dt's calendar month
+ impl->set_range_to_upcoming_month(dt.add_full(0, // no years
+ 0, // no months
+ -(dt.day_of_month()-1),
+ -dt.hour(),
+ -dt.minute(),
+ -dt.seconds());
+}
+
+void
+Planner::set_range_to_upcoming_month(const DateTime& begin)
+{
+ // use appointments that occur in [dt...dt+1month]
+ const auto end = begin.add_full(0, 1, 0, 0, 0, -0.1);
+ const char * fmt = "%F %T";
+ g_debug("RangePlanner %p setting range [%s..%s]",
+ this,
+ begin.format(fmt).c_str(),
+ end.format(fmt).c_str());
+ range().set(std::make_pair(begin,end));
+}
+
+void
+Planner::sort(std::vector<Appointment>& appts)
+{
+ std::sort(std::begin(appts),
+ std::end(appts),
+ [](const Appointment& a, const Appointment& b){return a.begin < b.begin;});
+}
+
+void
+Planner::trim(std::vector<Appointment>& appts,
+ const DateTime& begin,
+ const DateTime& end)
+{
+ decltype(appts) tmp;
+ auto predicate = [begin,end](const Appointment& a){return begin<=a.begin && a.begin<=end;}
+ std::copy(std::begin(appts), std::end(appts), std::back_inserter(tmp), predicate);
+ appts.swap(tmp);
+}
+
+/***
+****
+***/
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:58:37 +0000