tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2238 from LukashonakV/ISSUE#2204

Browse Source 
Issue#2204
This commit is contained in:
Alexis Rouillard
2023-06-16 15:38:20 +02:00
committed by GitHub
parent 83f3c2321e d650c597f9
commit 038644f8d9
2 changed files with 255 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/clock.cpp
View File

@ -22,19 +22,25 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
is_timezoned_list_in_tooltip_(false) {
if (config_["timezones"].isArray() && !config_["timezones"].empty()) {
for (const auto& zone_name : config_["timezones"]) {
if (!zone_name.isString() || zone_name.asString().empty()) continue;
if (!zone_name.isString()) continue;
if (zone_name.asString().empty())
time_zones_.push_back(date::current_zone());
else
try {
time_zones_.push_back(date::locate_zone(zone_name.asString()));
} catch (const std::exception& e) {
spdlog::warn("Timezone: {0}. {1}", zone_name.asString(), e.what());
}
}
} else if (config_["timezone"].isString()) {
if (config_["timezone"].asString().empty())
time_zones_.push_back(date::current_zone());
else
try {
time_zones_.push_back(date::locate_zone(zone_name.asString()));
time_zones_.push_back(date::locate_zone(config_["timezone"].asString()));
} catch (const std::exception& e) {
spdlog::warn("Timezone: {0}. {1}", zone_name.asString(), e.what());
spdlog::warn("Timezone: {0}. {1}", config_["timezone"].asString(), e.what());
}
}
} else if (config_["timezone"].isString() && !config_["timezone"].asString().empty()) {
try {
time_zones_.push_back(date::locate_zone(config_["timezone"].asString()));
} catch (const std::exception& e) {
spdlog::warn("Timezone: {0}. {1}", config_["timezone"].asString(), e.what());
}
}
// If all timezones are parsed and no one is good, add current time zone. nullptr in timezones