From 3979c7daa478199cff7bc985fceabcf30fadbc3b Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 23 May 2023 18:32:28 -0400 Subject: common: Move system time zone string detection Moves it from Settings to Common::TimeZone, since this algorithm doesn't depend on the setting. It also lets us use it in other libraries. common: Various fixes time_zone: Don't double up the std::abs Too many absolute values were causing mirrored time zones to resolve as the same. --- src/common/time_zone.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) (limited to 'src/common/time_zone.cpp') diff --git a/src/common/time_zone.cpp b/src/common/time_zone.cpp index 126836b01..717d751ba 100644 --- a/src/common/time_zone.cpp +++ b/src/common/time_zone.cpp @@ -4,12 +4,29 @@ #include #include #include +#include +#include #include "common/logging/log.h" +#include "common/settings.h" #include "common/time_zone.h" namespace Common::TimeZone { +// Time zone strings +constexpr std::array timezones{ + "GMT", "GMT", "CET", "CST6CDT", "Cuba", "EET", "Egypt", "Eire", + "EST", "EST5EDT", "GB", "GB-Eire", "GMT", "GMT+0", "GMT-0", "GMT0", + "Greenwich", "Hongkong", "HST", "Iceland", "Iran", "Israel", "Jamaica", "Japan", + "Kwajalein", "Libya", "MET", "MST", "MST7MDT", "Navajo", "NZ", "NZ-CHAT", + "Poland", "Portugal", "PRC", "PST8PDT", "ROC", "ROK", "Singapore", "Turkey", + "UCT", "Universal", "UTC", "W-SU", "WET", "Zulu", +}; + +const std::array& GetTimeZoneStrings() { + return timezones; +} + std::string GetDefaultTimeZone() { return "GMT"; } @@ -18,10 +35,7 @@ static std::string GetOsTimeZoneOffset() { const std::time_t t{std::time(nullptr)}; const std::tm tm{*std::localtime(&t)}; - std::stringstream ss; - ss << std::put_time(&tm, "%z"); // Get the current timezone offset, e.g. "-400", as a string - - return ss.str(); + return fmt::format("{:%z}", tm); } static int ConvertOsTimeZoneOffsetToInt(const std::string& timezone) { @@ -45,4 +59,57 @@ std::chrono::seconds GetCurrentOffsetSeconds() { return std::chrono::seconds{seconds}; } +std::string FindSystemTimeZone() { +#if defined(MINGW) + // MinGW has broken strftime -- https://sourceforge.net/p/mingw-w64/bugs/793/ + // e.g. fmt::format("{:%z}") -- returns "Eastern Daylight Time" when it should be "-0400" + return timezones[0]; +#else + // Time zone offset in seconds from GMT + constexpr std::array offsets{ + 0, 0, 3600, -21600, -19768, 7200, 7509, -1521, -18000, -18000, -75, -75, + 0, 0, 0, 0, 0, 27402, -36000, -968, 12344, 8454, -18430, 33539, + 40160, 3164, 3600, -25200, -25200, -25196, 41944, 44028, 5040, -2205, 29143, -28800, + 29160, 30472, 24925, 6952, 0, 0, 0, 9017, 0, 0, + }; + + // If the time zone recognizes Daylight Savings Time + constexpr std::array dst{ + false, false, true, true, true, true, true, true, false, true, true, true, + false, false, false, false, false, true, false, false, true, true, true, true, + false, true, true, false, true, true, true, true, true, true, true, true, + true, true, true, true, false, false, false, true, true, false, + }; + + static std::string system_time_zone_cached{}; + if (!system_time_zone_cached.empty()) { + return system_time_zone_cached; + } + + const auto now = std::time(nullptr); + const struct std::tm& local = *std::localtime(&now); + + const s64 system_offset = GetCurrentOffsetSeconds().count() - (local.tm_isdst ? 3600 : 0); + + int min = std::numeric_limits::max(); + int min_index = -1; + for (u32 i = 2; i < offsets.size(); i++) { + // Skip if system is celebrating DST but considered time zone does not + if (local.tm_isdst && !dst[i]) { + continue; + } + + const auto offset = offsets[i]; + const int difference = static_cast(std::abs(offset - system_offset)); + if (difference < min) { + min = difference; + min_index = i; + } + } + + system_time_zone_cached = GetTimeZoneStrings()[min_index]; + return system_time_zone_cached; +#endif +} + } // namespace Common::TimeZone -- cgit v1.2.3 From de1fe66d816f1d28fb7c24cab53961bccd4b3da1 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sat, 3 Jun 2023 17:06:43 -0400 Subject: time_zone: Handle offset time zones time_zone: Remove maybe_unused time_zone: Use s64 storages time_zone: Catch by reference --- src/common/time_zone.cpp | 64 ++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) (limited to 'src/common/time_zone.cpp') diff --git a/src/common/time_zone.cpp b/src/common/time_zone.cpp index 717d751ba..d8d7896c6 100644 --- a/src/common/time_zone.cpp +++ b/src/common/time_zone.cpp @@ -2,8 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include +#include #include #include +#include #include #include @@ -59,56 +61,42 @@ std::chrono::seconds GetCurrentOffsetSeconds() { return std::chrono::seconds{seconds}; } +// Key is [Hours * 100 + Minutes], multiplied by 100 if DST +const static std::map off_timezones = { + {530, "Asia/Calcutta"}, {930, "Australia/Darwin"}, {845, "Australia/Eucla"}, + {103000, "Australia/Adelaide"}, {1030, "Australia/Lord_Howe"}, {630, "Indian/Cocos"}, + {1245, "Pacific/Chatham"}, {134500, "Pacific/Chatham"}, {-330, "Canada/Newfoundland"}, + {-23000, "Canada/Newfoundland"}, {430, "Asia/Kabul"}, {330, "Asia/Tehran"}, + {43000, "Asia/Tehran"}, {545, "Asia/Kathmandu"}, {-930, "Asia/Marquesas"}, +}; + std::string FindSystemTimeZone() { #if defined(MINGW) // MinGW has broken strftime -- https://sourceforge.net/p/mingw-w64/bugs/793/ // e.g. fmt::format("{:%z}") -- returns "Eastern Daylight Time" when it should be "-0400" return timezones[0]; #else - // Time zone offset in seconds from GMT - constexpr std::array offsets{ - 0, 0, 3600, -21600, -19768, 7200, 7509, -1521, -18000, -18000, -75, -75, - 0, 0, 0, 0, 0, 27402, -36000, -968, 12344, 8454, -18430, 33539, - 40160, 3164, 3600, -25200, -25200, -25196, 41944, 44028, 5040, -2205, 29143, -28800, - 29160, 30472, 24925, 6952, 0, 0, 0, 9017, 0, 0, - }; - - // If the time zone recognizes Daylight Savings Time - constexpr std::array dst{ - false, false, true, true, true, true, true, true, false, true, true, true, - false, false, false, false, false, true, false, false, true, true, true, true, - false, true, true, false, true, true, true, true, true, true, true, true, - true, true, true, true, false, false, false, true, true, false, - }; - - static std::string system_time_zone_cached{}; - if (!system_time_zone_cached.empty()) { - return system_time_zone_cached; - } + const s64 seconds = static_cast(GetCurrentOffsetSeconds().count()); - const auto now = std::time(nullptr); - const struct std::tm& local = *std::localtime(&now); + const s64 minutes = seconds / 60; + const s64 hours = minutes / 60; - const s64 system_offset = GetCurrentOffsetSeconds().count() - (local.tm_isdst ? 3600 : 0); + const s64 minutes_off = minutes - hours * 60; - int min = std::numeric_limits::max(); - int min_index = -1; - for (u32 i = 2; i < offsets.size(); i++) { - // Skip if system is celebrating DST but considered time zone does not - if (local.tm_isdst && !dst[i]) { - continue; - } + if (minutes_off != 0) { + const auto the_time = std::time(nullptr); + const struct std::tm& local = *std::localtime(&the_time); + const bool is_dst = local.tm_isdst != 0; + + const s64 tz_index = (hours * 100 + minutes_off) * (is_dst ? 100 : 1); - const auto offset = offsets[i]; - const int difference = static_cast(std::abs(offset - system_offset)); - if (difference < min) { - min = difference; - min_index = i; + try { + return off_timezones.at(tz_index); + } catch (std::out_of_range&) { + LOG_ERROR(Common, "Time zone {} not handled, defaulting to hour offset.", tz_index); } } - - system_time_zone_cached = GetTimeZoneStrings()[min_index]; - return system_time_zone_cached; + return fmt::format("Etc/GMT{:s}{:d}", hours > 0 ? "-" : "+", std::abs(hours)); #endif } -- cgit v1.2.3