Rooba
/
polybar
mirror of https://github.com/polybar/polybar.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(cpu): Replace %percentage-cores% normally (#1282)

This commit is contained in:
Vasili Karaev 2018-09-15 17:43:55 +03:00 committed by NBonaparte
parent a881d49d9d
commit 2fba443f56
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/cpu.cpp
View File

@ -34,16 +34,6 @@ namespace modules {
m_rampload_core = load_ramp(m_conf, name(), TAG_RAMP_LOAD_PER_CORE); m_rampload_core = load_ramp(m_conf, name(), TAG_RAMP_LOAD_PER_CORE);
} }
if (m_formatter->has(TAG_LABEL)) { if (m_formatter->has(TAG_LABEL)) {
// Update the label parameter and replace the %percentag-cores% token with the individual core tokens
string key{&TAG_LABEL[1], strlen(TAG_LABEL) - 2};
auto label = m_conf.get<string>(name(), key, "%percentage%%");
vector<string> cores;
for (size_t i = 1; i <= m_cputimes.size(); i++) {
cores.emplace_back("%percentage-core" + to_string(i) + "%%");
}
label = string_util::replace_all(label, "%percentage-cores%", string_util::join(cores, " "));
const_cast<config&>(m_conf).set(name(), key, move(label));
m_label = load_optional_label(m_conf, name(), TAG_LABEL, "%percentage%%"); m_label = load_optional_label(m_conf, name(), TAG_LABEL, "%percentage%%");
} }
} }
@ -77,6 +67,7 @@ namespace modules {
if (m_label) { if (m_label) {
m_label->reset_tokens(); m_label->reset_tokens();
m_label->replace_token("%percentage%", to_string(static_cast<int>(m_total + 0.5))); m_label->replace_token("%percentage%", to_string(static_cast<int>(m_total + 0.5)));
m_label->replace_token("%percentage-cores%", string_util::join(percentage_cores, "% ") + "%");
for (size_t i = 0; i < percentage_cores.size(); i++) { for (size_t i = 0; i < percentage_cores.size(); i++) {
m_label->replace_token("%percentage-core" + to_string(i + 1) + "%", percentage_cores[i]); m_label->replace_token("%percentage-core" + to_string(i + 1) + "%", percentage_cores[i]);