RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1087 from Synthetica9/multiple-rewrites 

rewriteTitle: allow multiple sequential rewrites
pull/984/head
Alex 2021-04-27 00:00:53 +02:00 committed by GitHub
parent ef38061edd a03283d65f
commit 06e699c862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/sway/window.cpp
View File

@ -132,13 +132,14 @@ void Window::getTree() {
} }
} }
std::string Window::rewriteTitle(const std::string& title) std::string Window::rewriteTitle(const std::string& title) {
{
const auto& rules = config_["rewrite"]; const auto& rules = config_["rewrite"];
if (!rules.isObject()) { if (!rules.isObject()) {
return title; return title;
} }
std::string res = title;
for (auto it = rules.begin(); it != rules.end(); ++it) { for (auto it = rules.begin(); it != rules.end(); ++it) {
if (it.key().isString() && it->isString()) { if (it.key().isString() && it->isString()) {
try { try {
@ -146,7 +147,7 @@ std::string Window::rewriteTitle(const std::string& title)
// in this case, log error and try the next rule. // in this case, log error and try the next rule.
const std::regex rule{it.key().asString()}; const std::regex rule{it.key().asString()};
if (std::regex_match(title, rule)) { if (std::regex_match(title, rule)) {
return std::regex_replace(title, rule, it->asString()); res = std::regex_replace(res, rule, it->asString());
} }
} catch (const std::regex_error& e) { } catch (const std::regex_error& e) {
spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what()); spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
@ -154,7 +155,7 @@ std::string Window::rewriteTitle(const std::string& title)
} }
} }
return title; return res;
} }
} // namespace waybar::modules::sway } // namespace waybar::modules::sway