hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2025-01-27 04:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

widgets: add TZ env var support for $TIME (#627)

Browse source 
* widgets: add TZ env var support for $TIME

* widgets: refactor getTime if else brackets
This commit is contained in:
davc0n 2024-12-30 16:32:46 +01:00 committed by GitHub
parent 3d63d9b129
commit 2c5ae4d661
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/renderer/widgets/IWidget.cpp
View file

@ -2,7 +2,6 @@
#include "../../helpers/Log.hpp" #include "../../helpers/Log.hpp"
#include "../../core/hyprlock.hpp" #include "../../core/hyprlock.hpp"
#include "../../auth/Auth.hpp" #include "../../auth/Auth.hpp"
#include "../../auth/Fingerprint.hpp"
#include <chrono> #include <chrono>
#include <unistd.h> #include <unistd.h>
#include <pwd.h> #include <pwd.h>
@ -120,43 +119,46 @@ static void replaceAllLayout(std::string& str) {
} }
static bool logMissingTzOnce = true; static bool logMissingTzOnce = true;
static std::string getTime() { static std::chrono::hh_mm_ss<std::chrono::system_clock::duration> getTime() {
const auto PCURRENTTZ = std::chrono::current_zone(); const std::chrono::time_zone* pCurrentTz = nullptr;
const auto TPNOW = std::chrono::system_clock::now(); try {
auto name = std::getenv("TZ");
if (name)
pCurrentTz = std::chrono::locate_zone(name);
} catch (std::runtime_error&) {
Debug::log(WARN, "Invalid TZ value. Falling back to current timezone!");
}
if (!pCurrentTz)
pCurrentTz = std::chrono::current_zone();
const auto TPNOW = std::chrono::system_clock::now();
// //
std::chrono::hh_mm_ss<std::chrono::system_clock::duration> hhmmss; std::chrono::hh_mm_ss<std::chrono::system_clock::duration> hhmmss;
if (!PCURRENTTZ) { if (!pCurrentTz) {
if (logMissingTzOnce) { if (logMissingTzOnce) {
Debug::log(WARN, "Current timezone unknown for $TIME. Falling back to UTC!"); Debug::log(WARN, "Current timezone unknown. Falling back to UTC!");
logMissingTzOnce = false; logMissingTzOnce = false;
} }
hhmmss = std::chrono::hh_mm_ss{TPNOW - std::chrono::floor<std::chrono::days>(TPNOW)}; hhmmss = std::chrono::hh_mm_ss{TPNOW - std::chrono::floor<std::chrono::days>(TPNOW)};
} else } else
hhmmss = std::chrono::hh_mm_ss{PCURRENTTZ->to_local(TPNOW) - std::chrono::floor<std::chrono::days>(PCURRENTTZ->to_local(TPNOW))}; hhmmss = std::chrono::hh_mm_ss{pCurrentTz->to_local(TPNOW) - std::chrono::floor<std::chrono::days>(pCurrentTz->to_local(TPNOW))};
const auto HRS = hhmmss.hours().count(); return hhmmss;
const auto MINS = hhmmss.minutes().count(); }
static std::string getTime24h() {
const auto HHMMSS = getTime();
const auto HRS = HHMMSS.hours().count();
const auto MINS = HHMMSS.minutes().count();
return (HRS < 10 ? "0" : "") + std::to_string(HRS) + ":" + (MINS < 10 ? "0" : "") + std::to_string(MINS); return (HRS < 10 ? "0" : "") + std::to_string(HRS) + ":" + (MINS < 10 ? "0" : "") + std::to_string(MINS);
} }
static std::string getTime12h() { static std::string getTime12h() {
const auto PCURRENTTZ = std::chrono::current_zone(); const auto HHMMSS = getTime();
const auto TPNOW = std::chrono::system_clock::now(); const auto HRS = HHMMSS.hours().count();
const auto MINS = HHMMSS.minutes().count();
//
std::chrono::hh_mm_ss<std::chrono::system_clock::duration> hhmmss;
if (!PCURRENTTZ) {
if (logMissingTzOnce) {
Debug::log(WARN, "Current timezone unknown for $TIME12. Falling back to UTC!");
logMissingTzOnce = false;
}
hhmmss = std::chrono::hh_mm_ss{TPNOW - std::chrono::floor<std::chrono::days>(TPNOW)};
} else
hhmmss = std::chrono::hh_mm_ss{PCURRENTTZ->to_local(TPNOW) - std::chrono::floor<std::chrono::days>(PCURRENTTZ->to_local(TPNOW))};
const auto HRS = hhmmss.hours().count();
const auto MINS = hhmmss.minutes().count();
return (HRS == 12 || HRS == 0 ? "12" : (HRS % 12 < 10 ? "0" : "") + std::to_string(HRS % 12)) + ":" + (MINS < 10 ? "0" : "") + std::to_string(MINS) + return (HRS == 12 || HRS == 0 ? "12" : (HRS % 12 < 10 ? "0" : "") + std::to_string(HRS % 12)) + ":" + (MINS < 10 ? "0" : "") + std::to_string(MINS) +
(HRS < 12 ? " AM" : " PM"); (HRS < 12 ? " AM" : " PM");
} }
@ -184,7 +186,7 @@ IWidget::SFormatResult IWidget::formatString(std::string in) {
} }
if (in.contains("$TIME")) { if (in.contains("$TIME")) {
replaceInString(in, "$TIME", getTime()); replaceInString(in, "$TIME", getTime24h());
result.updateEveryMs = result.updateEveryMs != 0 && result.updateEveryMs < 1000 ? result.updateEveryMs : 1000; result.updateEveryMs = result.updateEveryMs != 0 && result.updateEveryMs < 1000 ? result.updateEveryMs : 1000;
} }