pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(date): Use single stringstream

Browse Source 
Reduces code repetition and removes the need for setting the locale in
every update
This commit is contained in:
patrick96 2017-09-15 14:21:38 +02:00
parent 6e9e739d81
commit 1bc9933a88
No known key found for this signature in database
GPG Key ID: 521E5E03AEBCA1A7
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/modules/date.hpp
View File

@ -37,9 +37,10 @@ namespace modules {
string m_date; string m_date;
string m_time; string m_time;
std::atomic<bool> m_toggled{false}; // Single stringstream to be used to gather the results of std::put_time
std::stringstream datetime_stream;
void set_stream_locale(std::stringstream &stream); std::atomic<bool> m_toggled{false};
}; };
} }

23
src/modules/date.cpp
View File

@ -11,6 +11,7 @@ namespace modules {
date_module::date_module(const bar_settings& bar, string name_) : timer_module<date_module>(bar, move(name_)) { date_module::date_module(const bar_settings& bar, string name_) : timer_module<date_module>(bar, move(name_)) {
if (!m_bar.locale.empty()) { if (!m_bar.locale.empty()) {
setlocale(LC_TIME, m_bar.locale.c_str()); setlocale(LC_TIME, m_bar.locale.c_str());
datetime_stream.imbue(std::locale(m_bar.locale.c_str()));
} }
m_dateformat = string_util::trim(m_conf.get(name(), "date", ""s), '"'); m_dateformat = string_util::trim(m_conf.get(name(), "date", ""s), '"');
@ -38,26 +39,20 @@ namespace modules {
} }
} }
void date_module::set_stream_locale(std::stringstream &stream) {
if(!m_bar.locale.empty()) {
stream.imbue(std::locale(m_bar.locale.c_str()));
}
}
bool date_module::update() { bool date_module::update() {
auto time = std::time(nullptr); auto time = std::time(nullptr);
auto date_format = m_toggled ? m_dateformat_alt : m_dateformat; auto date_format = m_toggled ? m_dateformat_alt : m_dateformat;
std::stringstream date_stream; // Clear stream contents
set_stream_locale(date_stream); datetime_stream.str("");
date_stream << std::put_time(localtime(&time), date_format.c_str()); datetime_stream << std::put_time(localtime(&time), date_format.c_str());
auto date_string = date_stream.str(); auto date_string = datetime_stream.str();
auto time_format = m_toggled ? m_timeformat_alt : m_timeformat; auto time_format = m_toggled ? m_timeformat_alt : m_timeformat;
std::stringstream time_stream; // Clear stream contents
set_stream_locale(time_stream); datetime_stream.str("");
time_stream << std::put_time(localtime(&time), time_format.c_str()); datetime_stream << std::put_time(localtime(&time), time_format.c_str());
auto time_string = time_stream.str(); auto time_string = datetime_stream.str();
bool date_changed{strncmp(date_string.c_str(), m_date.c_str(), sizeof(date_string)) != 0}; bool date_changed{strncmp(date_string.c_str(), m_date.c_str(), sizeof(date_string)) != 0};
bool time_changed{strncmp(time_string.c_str(), m_time.c_str(), sizeof(time_string)) != 0}; bool time_changed{strncmp(time_string.c_str(), m_time.c_str(), sizeof(time_string)) != 0};