From a3937830bf656d5a8e2f368757b947cef0c8b1de Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 1 Sep 2015 10:52:13 +0100 Subject: Rename FileTimezone to TimedatedTimezone --- include/datetime/timezone-file.h | 54 -------- include/datetime/timezone-timedated.h | 54 ++++++++ include/datetime/timezones-live.h | 6 +- src/CMakeLists.txt | 2 +- src/main.cpp | 4 +- src/timezone-file.cpp | 238 ---------------------------------- src/timezone-timedated.cpp | 238 ++++++++++++++++++++++++++++++++++ tests/CMakeLists.txt | 2 +- tests/test-timezone-file.cpp | 73 ----------- tests/test-timezone-timedated.cpp | 73 +++++++++++ 10 files changed, 372 insertions(+), 372 deletions(-) delete mode 100644 include/datetime/timezone-file.h create mode 100644 include/datetime/timezone-timedated.h delete mode 100644 src/timezone-file.cpp create mode 100644 src/timezone-timedated.cpp delete mode 100644 tests/test-timezone-file.cpp create mode 100644 tests/test-timezone-timedated.cpp diff --git a/include/datetime/timezone-file.h b/include/datetime/timezone-file.h deleted file mode 100644 index 05dc7b0..0000000 --- a/include/datetime/timezone-file.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 . - * - * Authors: - * Charles Kerr - */ - -#ifndef INDICATOR_DATETIME_FILE_TIMEZONE_H -#define INDICATOR_DATETIME_FILE_TIMEZONE_H - -#include // base class - -#include // std::string - -namespace unity { -namespace indicator { -namespace datetime { - -/** - * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone - */ -class FileTimezone: public Timezone -{ -public: - FileTimezone(); - ~FileTimezone(); - -private: - class Impl; - friend Impl; - std::unique_ptr impl; - - // we have pointers in here, so disable copying - FileTimezone(const FileTimezone&) =delete; - FileTimezone& operator=(const FileTimezone&) =delete; -}; - -} // namespace datetime -} // namespace indicator -} // namespace unity - -#endif // INDICATOR_DATETIME_FILE_TIMEZONE_H diff --git a/include/datetime/timezone-timedated.h b/include/datetime/timezone-timedated.h new file mode 100644 index 0000000..3df9a3e --- /dev/null +++ b/include/datetime/timezone-timedated.h @@ -0,0 +1,54 @@ +/* + * 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 . + * + * Authors: + * Charles Kerr + */ + +#ifndef INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H +#define INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H + +#include // base class + +#include // std::string + +namespace unity { +namespace indicator { +namespace datetime { + +/** + * \brief A #Timezone that gets its information from monitoring a file, such as /etc/timezone + */ +class TimedatedTimezone: public Timezone +{ +public: + TimedatedTimezone(); + ~TimedatedTimezone(); + +private: + class Impl; + friend Impl; + std::unique_ptr impl; + + // we have pointers in here, so disable copying + TimedatedTimezone(const TimedatedTimezone&) =delete; + TimedatedTimezone& operator=(const TimedatedTimezone&) =delete; +}; + +} // namespace datetime +} // namespace indicator +} // namespace unity + +#endif // INDICATOR_DATETIME_TIMEDATED_TIMEZONE_H diff --git a/include/datetime/timezones-live.h b/include/datetime/timezones-live.h index 49d9120..b9d78a5 100644 --- a/include/datetime/timezones-live.h +++ b/include/datetime/timezones-live.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include // shared_ptr<> @@ -32,7 +32,7 @@ namespace indicator { namespace datetime { /** - * \brief #Timezones object that uses a #FileTimezone and #GeoclueTimezone + * \brief #Timezones object that uses a #TimedatedTimezone and #GeoclueTimezone * to detect what timezone we're in */ class LiveTimezones: public Timezones @@ -44,7 +44,7 @@ private: void update_geolocation(); void update_timezones(); - FileTimezone m_file; + TimedatedTimezone m_file; std::shared_ptr m_settings; std::shared_ptr m_geo; }; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f27e99..f8d219a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,9 +33,9 @@ set (SERVICE_CXX_SOURCES settings-live.cpp snap.cpp sound.cpp - timezone-file.cpp timezone-geoclue.cpp timezones-live.cpp + timezone-timedated.cpp utils.c wakeup-timer-mainloop.cpp wakeup-timer-powerd.cpp) diff --git a/src/main.cpp b/src/main.cpp index 460f98c..c7769c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include @@ -128,7 +128,7 @@ main(int /*argc*/, char** /*argv*/) textdomain(GETTEXT_PACKAGE); auto engine = create_engine(); - auto timezone_ = std::make_shared(); + auto timezone_ = std::make_shared(); auto state = create_state(engine, timezone_); auto actions = std::make_shared(state); MenuFactory factory(actions, state); diff --git a/src/timezone-file.cpp b/src/timezone-file.cpp deleted file mode 100644 index ef9d78a..0000000 --- a/src/timezone-file.cpp +++ /dev/null @@ -1,238 +0,0 @@ -/* - * 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 . - * - * Authors: - * Charles Kerr - */ - -#include - -#include - -#include -#include - -namespace unity { -namespace indicator { -namespace datetime { - -/*** -**** -***/ - -class FileTimezone::Impl -{ -public: - - Impl(FileTimezone& owner): - m_owner(owner), - m_loop(g_main_loop_new(nullptr, FALSE)) - { - monitor_timezone_property(); - } - - ~Impl() - { - clear(); - } - -private: - - void clear() - { - if (m_bus_watch_id) - { - g_bus_unwatch_name (m_bus_watch_id); - m_bus_watch_id = 0; - } - - if (m_properties_changed_id) - { - g_signal_handler_disconnect(m_proxy, m_properties_changed_id); - m_properties_changed_id = 0; - } - - if (m_timeout_id) - { - g_source_remove(m_timeout_id); - m_timeout_id = 0; - } - - g_clear_object(&m_proxy); - g_clear_pointer(&m_loop, g_main_loop_unref); - } - - static void on_properties_changed(GDBusProxy *proxy G_GNUC_UNUSED, - GVariant *changed_properties /* a{sv} */, - GStrv invalidated_properties G_GNUC_UNUSED, - gpointer gself) - { - auto self = static_cast(gself); - char *tz; - - if (g_variant_lookup(changed_properties, "Timezone", "s", &tz, NULL)) - { - g_debug("on_properties_changed: got timezone '%s'", tz); - self->notify_timezone(tz); - g_free (tz); - } - } - - static void on_proxy_ready(GObject *object G_GNUC_UNUSED, - GAsyncResult *res, - gpointer gself) - { - auto self = static_cast(gself); - GError *error = nullptr; - self->m_proxy = g_dbus_proxy_new_finish(res, &error); - - if (error) - { - g_warning ("Couldn't create proxy to read timezone: %s", error->message); - goto out; - } - - /* Read the property */ - GVariant *prop; - prop = g_dbus_proxy_get_cached_property(self->m_proxy, "Timezone"); - - if (!prop || !g_variant_is_of_type(prop, G_VARIANT_TYPE_STRING)) - { - g_warning("Couldn't read the Timezone property, defaulting to Etc/Utc"); - self->notify_timezone("Etc/Utc"); - goto out; - } - - const gchar *tz; - tz = g_variant_get_string(prop, nullptr); - - self->notify_timezone(tz); - - self->m_properties_changed_id = g_signal_connect(self->m_proxy, - "g-properties-changed", - (GCallback) on_properties_changed, - gself); - -out: - g_clear_pointer(&error, g_error_free); - g_clear_pointer(&prop, g_variant_unref); - if (self->m_loop && g_main_loop_is_running(self->m_loop)) - g_main_loop_quit(self->m_loop); - - if (self->m_timeout_id) - { - g_source_remove(self->m_timeout_id); - self->m_timeout_id = 0; - } - } - - static void on_name_appeared(GDBusConnection *connection, - const gchar *name, - const gchar *name_owner G_GNUC_UNUSED, - gpointer gself G_GNUC_UNUSED) - { - g_debug ("timedate1 appeared"); - g_dbus_proxy_new(connection, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - name, - "/org/freedesktop/timedate1", - "org.freedesktop.timedate1", - nullptr, - on_proxy_ready, - gself); - } - - static gboolean quit_loop(gpointer gself) - { - auto self = static_cast(gself); - - g_warning("Timed out when getting initial value of timezone, defaulting to UTC"); - self->notify_timezone("Etc/Utc"); - - g_main_loop_quit(self->m_loop); - - self->m_timeout_id = 0; - - return G_SOURCE_REMOVE; - } - - static void on_name_vanished(GDBusConnection *connection G_GNUC_UNUSED, - const gchar *name G_GNUC_UNUSED, - gpointer gself) - { - auto self = static_cast(gself); - g_debug ("timedate1 vanished"); - - g_signal_handler_disconnect(self->m_proxy, - self->m_properties_changed_id); - self->m_properties_changed_id = 0; - g_clear_object(&self->m_proxy); - g_clear_pointer(&self->m_proxy, g_main_loop_unref); - } - - void monitor_timezone_property() - { - m_bus_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, - "org.freedesktop.timedate1", - G_BUS_NAME_WATCHER_FLAGS_AUTO_START, - on_name_appeared, - on_name_vanished, - this, - nullptr); - - /* Incase something breaks, we don't want to hang */ - m_timeout_id = g_timeout_add(500, quit_loop, this); - g_main_loop_run(m_loop); - } - - void notify_timezone(std::string new_timezone) - { - if (!new_timezone.empty()) - m_owner.timezone.set(new_timezone); - } - - /*** - **** - ***/ - - FileTimezone & m_owner; - unsigned long m_properties_changed_id = 0; - unsigned long m_bus_watch_id = 0; - unsigned long m_timeout_id = 0; - GDBusProxy *m_proxy = nullptr; - GMainLoop *m_loop = nullptr; -}; - -/*** -**** -***/ - -FileTimezone::FileTimezone(): - impl(new Impl{*this}) -{ -} - -FileTimezone::~FileTimezone() -{ -} - -/*** -**** -***/ - -} // namespace datetime -} // namespace indicator -} // namespace unity diff --git a/src/timezone-timedated.cpp b/src/timezone-timedated.cpp new file mode 100644 index 0000000..778697a --- /dev/null +++ b/src/timezone-timedated.cpp @@ -0,0 +1,238 @@ +/* + * 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 . + * + * Authors: + * Charles Kerr + */ + +#include + +#include + +#include +#include + +namespace unity { +namespace indicator { +namespace datetime { + +/*** +**** +***/ + +class TimedatedTimezone::Impl +{ +public: + + Impl(TimedatedTimezone& owner): + m_owner(owner), + m_loop(g_main_loop_new(nullptr, FALSE)) + { + monitor_timezone_property(); + } + + ~Impl() + { + clear(); + } + +private: + + void clear() + { + if (m_bus_watch_id) + { + g_bus_unwatch_name (m_bus_watch_id); + m_bus_watch_id = 0; + } + + if (m_properties_changed_id) + { + g_signal_handler_disconnect(m_proxy, m_properties_changed_id); + m_properties_changed_id = 0; + } + + if (m_timeout_id) + { + g_source_remove(m_timeout_id); + m_timeout_id = 0; + } + + g_clear_object(&m_proxy); + g_clear_pointer(&m_loop, g_main_loop_unref); + } + + static void on_properties_changed(GDBusProxy *proxy G_GNUC_UNUSED, + GVariant *changed_properties /* a{sv} */, + GStrv invalidated_properties G_GNUC_UNUSED, + gpointer gself) + { + auto self = static_cast(gself); + char *tz; + + if (g_variant_lookup(changed_properties, "Timezone", "s", &tz, NULL)) + { + g_debug("on_properties_changed: got timezone '%s'", tz); + self->notify_timezone(tz); + g_free (tz); + } + } + + static void on_proxy_ready(GObject *object G_GNUC_UNUSED, + GAsyncResult *res, + gpointer gself) + { + auto self = static_cast(gself); + GError *error = nullptr; + self->m_proxy = g_dbus_proxy_new_finish(res, &error); + + if (error) + { + g_warning ("Couldn't create proxy to read timezone: %s", error->message); + goto out; + } + + /* Read the property */ + GVariant *prop; + prop = g_dbus_proxy_get_cached_property(self->m_proxy, "Timezone"); + + if (!prop || !g_variant_is_of_type(prop, G_VARIANT_TYPE_STRING)) + { + g_warning("Couldn't read the Timezone property, defaulting to Etc/Utc"); + self->notify_timezone("Etc/Utc"); + goto out; + } + + const gchar *tz; + tz = g_variant_get_string(prop, nullptr); + + self->notify_timezone(tz); + + self->m_properties_changed_id = g_signal_connect(self->m_proxy, + "g-properties-changed", + (GCallback) on_properties_changed, + gself); + +out: + g_clear_pointer(&error, g_error_free); + g_clear_pointer(&prop, g_variant_unref); + if (self->m_loop && g_main_loop_is_running(self->m_loop)) + g_main_loop_quit(self->m_loop); + + if (self->m_timeout_id) + { + g_source_remove(self->m_timeout_id); + self->m_timeout_id = 0; + } + } + + static void on_name_appeared(GDBusConnection *connection, + const gchar *name, + const gchar *name_owner G_GNUC_UNUSED, + gpointer gself G_GNUC_UNUSED) + { + g_debug ("timedate1 appeared"); + g_dbus_proxy_new(connection, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + name, + "/org/freedesktop/timedate1", + "org.freedesktop.timedate1", + nullptr, + on_proxy_ready, + gself); + } + + static gboolean quit_loop(gpointer gself) + { + auto self = static_cast(gself); + + g_warning("Timed out when getting initial value of timezone, defaulting to UTC"); + self->notify_timezone("Etc/Utc"); + + g_main_loop_quit(self->m_loop); + + self->m_timeout_id = 0; + + return G_SOURCE_REMOVE; + } + + static void on_name_vanished(GDBusConnection *connection G_GNUC_UNUSED, + const gchar *name G_GNUC_UNUSED, + gpointer gself) + { + auto self = static_cast(gself); + g_debug ("timedate1 vanished"); + + g_signal_handler_disconnect(self->m_proxy, + self->m_properties_changed_id); + self->m_properties_changed_id = 0; + g_clear_object(&self->m_proxy); + g_clear_pointer(&self->m_proxy, g_main_loop_unref); + } + + void monitor_timezone_property() + { + m_bus_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM, + "org.freedesktop.timedate1", + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + on_name_appeared, + on_name_vanished, + this, + nullptr); + + /* Incase something breaks, we don't want to hang */ + m_timeout_id = g_timeout_add(500, quit_loop, this); + g_main_loop_run(m_loop); + } + + void notify_timezone(std::string new_timezone) + { + if (!new_timezone.empty()) + m_owner.timezone.set(new_timezone); + } + + /*** + **** + ***/ + + TimedatedTimezone & m_owner; + unsigned long m_properties_changed_id = 0; + unsigned long m_bus_watch_id = 0; + unsigned long m_timeout_id = 0; + GDBusProxy *m_proxy = nullptr; + GMainLoop *m_loop = nullptr; +}; + +/*** +**** +***/ + +TimedatedTimezone::TimedatedTimezone(): + impl(new Impl{*this}) +{ +} + +TimedatedTimezone::~TimedatedTimezone() +{ +} + +/*** +**** +***/ + +} // namespace datetime +} // namespace indicator +} // namespace unity diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9d26484..032b84e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -58,7 +58,7 @@ add_test_by_name(test-locations) add_test_by_name(test-menus) add_test_by_name(test-planner) add_test_by_name(test-settings) -add_test_by_name(test-timezone-file) +add_test_by_name(test-timezone-timedated) add_test_by_name(test-utils) set (TEST_NAME manual-test-snap) diff --git a/tests/test-timezone-file.cpp b/tests/test-timezone-file.cpp deleted file mode 100644 index 0ec496d..0000000 --- a/tests/test-timezone-file.cpp +++ /dev/null @@ -1,73 +0,0 @@ - -/* - * Copyright 2013 Canonical Ltd. - * - * Authors: - * Charles Kerr - * - * 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 . - */ - -#include "timedated-fixture.h" - -#include - -#include // fopen() -//#include // chmod() -#include // sync() - -using unity::indicator::datetime::FileTimezone; - -/** - * Test that timezone-file picks up the initial value - */ -TEST_F(TimedateFixture, InitialValue) -{ - const std::string expected_timezone = "America/Chicago"; - set_timezone(expected_timezone); - FileTimezone tz; - ASSERT_EQ(expected_timezone, tz.timezone.get()); -} - -/** - * Test that changing the tz after we are running works. - */ -TEST_F(TimedateFixture, ChangedValue) -{ - const std::string initial_timezone = "America/Chicago"; - const std::string changed_timezone = "America/New_York"; - GMainLoop *l = g_main_loop_new(nullptr, FALSE); - - set_timezone(initial_timezone); - - FileTimezone tz; - ASSERT_EQ(initial_timezone, tz.timezone.get()); - - bool changed = false; - tz.timezone.changed().connect( - [&changed, this, l](const std::string& s){ - g_message("timezone changed to %s", s.c_str()); - changed = true; - g_main_loop_quit(l); - }); - - g_idle_add([](gpointer gself){ - static_cast(gself)->set_timezone("America/New_York"); - return G_SOURCE_REMOVE; - }, this); - - g_main_loop_run(l); - - ASSERT_TRUE(changed); - ASSERT_EQ(changed_timezone, tz.timezone.get()); -} diff --git a/tests/test-timezone-timedated.cpp b/tests/test-timezone-timedated.cpp new file mode 100644 index 0000000..7086e96 --- /dev/null +++ b/tests/test-timezone-timedated.cpp @@ -0,0 +1,73 @@ + +/* + * Copyright 2013 Canonical Ltd. + * + * Authors: + * Charles Kerr + * + * 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 . + */ + +#include "timedated-fixture.h" + +#include + +#include // fopen() +//#include // chmod() +#include // sync() + +using unity::indicator::datetime::TimedatedTimezone; + +/** + * Test that timezone-file picks up the initial value + */ +TEST_F(TimedateFixture, InitialValue) +{ + const std::string expected_timezone = "America/Chicago"; + set_timezone(expected_timezone); + TimedatedTimezone tz; + ASSERT_EQ(expected_timezone, tz.timezone.get()); +} + +/** + * Test that changing the tz after we are running works. + */ +TEST_F(TimedateFixture, ChangedValue) +{ + const std::string initial_timezone = "America/Chicago"; + const std::string changed_timezone = "America/New_York"; + GMainLoop *l = g_main_loop_new(nullptr, FALSE); + + set_timezone(initial_timezone); + + TimedatedTimezone tz; + ASSERT_EQ(initial_timezone, tz.timezone.get()); + + bool changed = false; + tz.timezone.changed().connect( + [&changed, this, l](const std::string& s){ + g_message("timezone changed to %s", s.c_str()); + changed = true; + g_main_loop_quit(l); + }); + + g_idle_add([](gpointer gself){ + static_cast(gself)->set_timezone("America/New_York"); + return G_SOURCE_REMOVE; + }, this); + + g_main_loop_run(l); + + ASSERT_TRUE(changed); + ASSERT_EQ(changed_timezone, tz.timezone.get()); +} -- cgit v1.2.3