From b115811bcafc3ce5193dc75cb7929a8f3f2cba00 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 24 Mar 2015 13:42:16 -0500 Subject: add support for an x-canonical-app-url x-prop when reading vtodos/vevents from EDS --- src/engine-eds.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 47c7a9b..8408a57 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -33,8 +33,10 @@ namespace unity { namespace indicator { namespace datetime { -static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; -static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; +static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; +static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; + +static constexpr char const * X_PROP_APP_URL {"x-canonical-app-url"}; /**** ***** @@ -469,6 +471,24 @@ private: if (text.value) appointment.summary = text.value; + auto icc = e_cal_component_get_icalcomponent(component); // component owns icc + if (icc) + { + auto icalprop = icalcomponent_get_first_property(icc, ICAL_X_PROPERTY); + while (icalprop) + { + const char * x_name = icalproperty_get_x_name(icalprop); + if (!g_strcmp0(x_name, X_PROP_APP_URL)) + { + const char * url = icalproperty_get_value_as_string(icalprop); + if ((url != nullptr) && appointment.url.empty()) + appointment.url = url; + } + + icalprop = icalcomponent_get_next_property(icc, ICAL_X_PROPERTY); + } + } + appointment.begin = begin_dt; appointment.end = end_dt; appointment.color = subtask->color; -- cgit v1.2.3 From d5002c6b27cf0e00828555a10e89778008d6cd01 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 24 Mar 2015 14:28:23 -0500 Subject: make the string test case-insensitive --- src/engine-eds.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 8408a57..a47ab4a 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -33,10 +33,10 @@ namespace unity { namespace indicator { namespace datetime { -static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; -static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; +static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; +static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; -static constexpr char const * X_PROP_APP_URL {"x-canonical-app-url"}; +static constexpr char const * X_PROP_ACTIVATION_URL {"X-CANONICAL-ACTIVATION-URL"}; /**** ***** @@ -478,7 +478,7 @@ private: while (icalprop) { const char * x_name = icalproperty_get_x_name(icalprop); - if (!g_strcmp0(x_name, X_PROP_APP_URL)) + if ((x_name != nullptr) && !g_ascii_strcasecmp(x_name, X_PROP_ACTIVATION_URL)) { const char * url = icalproperty_get_value_as_string(icalprop); if ((url != nullptr) && appointment.url.empty()) -- cgit v1.2.3 From 3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Apr 2015 13:20:25 -0500 Subject: resolve minor shear with trunk --- src/engine-eds.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index b91fd71..e1424d7 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -542,6 +542,8 @@ private: auto icc = e_cal_component_get_icalcomponent(component); // component owns icc if (icc) { + g_debug("%s", icalcomponent_as_ical_string(icc)); // libical owns this string; no leak + auto icalprop = icalcomponent_get_first_property(icc, ICAL_X_PROPERTY); while (icalprop) { @@ -549,8 +551,8 @@ private: if ((x_name != nullptr) && !g_ascii_strcasecmp(x_name, X_PROP_ACTIVATION_URL)) { const char * url = icalproperty_get_value_as_string(icalprop); - if ((url != nullptr) && appointment.url.empty()) - appointment.url = url; + if ((url != nullptr) && appointment.activation_url.empty()) + appointment.activation_url = url; } icalprop = icalcomponent_get_next_property(icc, ICAL_X_PROPERTY); @@ -563,9 +565,6 @@ private: appointment.uid = uid; appointment.type = type; - icalcomponent * icc = e_cal_component_get_icalcomponent(component); - g_debug("%s", icalcomponent_as_ical_string(icc)); // libical owns this string; no leak - auto e_alarms = e_cal_util_generate_alarms_for_comp(component, subtask->begin, subtask->end, -- cgit v1.2.3 From 4d94be8b6cce52862a401ed39bad9209c71f9a3e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 7 May 2015 19:08:13 -0500 Subject: Add unit test that looks at ubuntu alarm triggers. Test currently fails on the trigger timezone issue reported by alesage. --- tests/CMakeLists.txt | 1 + .../.config/evolution/sources/system-proxy.source | 21 +++++ .../.local/share/evolution/tasks/system/tasks.ics | 28 ++++++ tests/test-eds-tasks.cpp | 101 +++++++++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source create mode 100644 tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics create mode 100644 tests/test-eds-tasks.cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8b6ec5d..41efa06 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -93,6 +93,7 @@ function(add_eds_test_by_name name) ${GVFSD} # arg7: gvfsd exec ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}-config-files) # arg8: canned config files endfunction() +add_eds_test_by_name(test-eds-tasks) add_eds_test_by_name(test-eds-valarms) diff --git a/tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source b/tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source new file mode 100644 index 0000000..4b2f666 --- /dev/null +++ b/tests/test-eds-tasks-config-files/.config/evolution/sources/system-proxy.source @@ -0,0 +1,21 @@ + +[Data Source] +DisplayName=Default Proxy Settings +Enabled=true +Parent= + +[Proxy] +Method=default +IgnoreHosts=localhost;127.0.0.0/8;::1; +AutoconfigUrl= +FtpHost= +FtpPort=0 +HttpAuthPassword= +HttpAuthUser= +HttpHost= +HttpPort=8080 +HttpUseAuth=false +HttpsHost= +HttpsPort=0 +SocksHost= +SocksPort=0 diff --git a/tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics b/tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics new file mode 100644 index 0000000..efde5f7 --- /dev/null +++ b/tests/test-eds-tasks-config-files/.local/share/evolution/tasks/system/tasks.ics @@ -0,0 +1,28 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +X-EVOLUTION-DATA-REVISION:2015-05-07T21:14:49.315443Z(0) +BEGIN:VTODO +UID:20150507T211449Z-4262-32011-1418-1@ubuntu-phablet +DTSTAMP:20150508T211449Z +DTSTART:20150508T164000 +RRULE:FREQ=WEEKLY;BYDAY=FR +SUMMARY:Alarm +CATEGORIES:x-canonical-alarm +CREATED:20150507T211449Z +LAST-MODIFIED:20150507T211449Z +BEGIN:VALARM +X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet +ACTION:AUDIO +ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg +TRIGGER;VALUE=DURATION;RELATED=START:PT0S +END:VALARM +BEGIN:VALARM +X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-3@ubuntu-phablet +ACTION:DISPLAY +DESCRIPTION:Alarm +TRIGGER;VALUE=DURATION;RELATED=START:PT0S +END:VALARM +END:VTODO +END:VCALENDAR diff --git a/tests/test-eds-tasks.cpp b/tests/test-eds-tasks.cpp new file mode 100644 index 0000000..6dbb49f --- /dev/null +++ b/tests/test-eds-tasks.cpp @@ -0,0 +1,101 @@ +/* + * Copyright 2015 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 . + * + * Authors: + * Charles Kerr + */ + +#include + +#include +#include +#include +#include + +#include + +#include "glib-fixture.h" +#include "print-to.h" +#include "timezone-mock.h" +#include "wakeup-timer-mock.h" + +using namespace unity::indicator::datetime; +using VAlarmFixture = GlibFixture; + +/*** +**** +***/ + +TEST_F(VAlarmFixture, MultipleAppointments) +{ + // start the EDS engine + auto engine = std::make_shared(); + + // we need a consistent timezone for the planner and our local DateTimes + constexpr char const * zone_str {"America/Chicago"}; + auto tz = std::make_shared(zone_str); + auto gtz = g_time_zone_new(zone_str); + + // make a planner that looks at the first half of 2015 in EDS + auto planner = std::make_shared(engine, tz); + const DateTime range_begin {gtz, 2015,1, 1, 0, 0, 0.0}; + const DateTime range_end {gtz, 2015,6,31,23,59,59.5}; + planner->range().set(std::make_pair(range_begin, range_end)); + + // give EDS a moment to load + if (planner->appointments().get().empty()) { + g_message("waiting a moment for EDS to load..."); + auto on_appointments_changed = [this](const std::vector& appointments){ + g_message("ah, they loaded"); + if (!appointments.empty()) + g_main_loop_quit(loop); + }; + core::ScopedConnection conn(planner->appointments().changed().connect(on_appointments_changed)); + constexpr int max_wait_sec = 10; + wait_msec(max_wait_sec * G_TIME_SPAN_MILLISECOND); + } + + // what we expect to get... + Appointment expected_appt; + expected_appt.uid = "20150507T211449Z-4262-32011-1418-1@ubuntu-phablet"; + expected_appt.color = "#becedd"; + expected_appt.summary = "Alarm"; + std::array expected_alarms = { + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5, 8,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,15,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,22,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,5,29,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6, 5,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,12,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,19,16,40,0)}), + Alarm({"Alarm", "file:///usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg", DateTime(gtz,2015,6,26,16,40,0)}) + }; + + // compare it to what we actually loaded... + const auto appts = planner->appointments().get(); + EXPECT_EQ(expected_alarms.size(), appts.size()); + for (size_t i=0, n=expected_alarms.size(); i Date: Thu, 7 May 2015 19:10:37 -0500 Subject: in EngineEds' call to e_cal_util_generate_alarms_for_comp(), use nullptr as the default timezone so that we don't convert to local twice (once in _generate_alarms_for_comp, once in the DateTime ctor). Fixes the previous commit's failing test. --- src/engine-eds.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index e1424d7..9c1f7c4 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -571,7 +571,7 @@ private: const_cast(omit.data()), e_cal_client_resolve_tzid_cb, subtask->client, - subtask->default_timezone); + nullptr); std::map alarms; -- cgit v1.2.3