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

Refactor rewriteTitle

Browse Source
This commit is contained in:
herlev 2022-10-19 13:25:08 +02:00
parent f72c1a54d3
commit 54e04b5a30
7 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/hyprland/window.hpp
View File

@ -19,7 +19,6 @@ class Window : public waybar::ALabel {
private:
uint getActiveWorkspaceID(std::string);
std::string getLastWindowTitle(uint);
std::string rewriteTitle(const std::string&);
void onEvent(const std::string&);
bool separate_outputs;

1
include/modules/sway/window.hpp
View File

@ -24,7 +24,6 @@ class Window : public AIconLabel, public sigc::trackable {
std::tuple<std::size_t, int, std::string, std::string, std::string, std::string> getFocusedNode(
const Json::Value& nodes, std::string& output);
void getTree();
std::string rewriteTitle(const std::string& title);
void updateAppIconName();
void updateAppIcon();

8
include/util/rewrite_title.hpp Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include <json/json.h>
#include <string>
namespace waybar::util {
std::string rewriteTitle(const std::string&, const Json::Value&);
}

3
meson.build
View File

@ -157,7 +157,8 @@ src_files = files(
'src/config.cpp',
'src/group.cpp',
'src/util/ustring_clen.cpp',
'src/util/sanitize_str.cpp'
'src/util/sanitize_str.cpp',
'src/util/rewrite_title.cpp'
)
if is_linux

32
src/modules/hyprland/window.cpp
View File

@ -8,6 +8,7 @@
#include "modules/hyprland/backend.hpp"
#include "util/command.hpp"
#include "util/json.hpp"
#include "util/rewrite_title.hpp"
namespace waybar::modules::hyprland {
@ -33,7 +34,7 @@ auto Window::update() -> void {
if (!format_.empty()) {
label_.show();
label_.set_markup(fmt::format(format_, rewriteTitle(lastView)));
label_.set_markup(fmt::format(format_, waybar::util::rewriteTitle(lastView, config_["rewrite"])));
} else {
label_.hide();
}
@ -61,7 +62,7 @@ std::string Window::getLastWindowTitle(uint workspaceID) {
return workspace["id"].as<uint>() == workspaceID;
});
if (workspace != std::end(json)) {
if (workspace == std::end(json)) {
return "";
}
return (*workspace)["lastwindowtitle"].as<std::string>();
@ -87,31 +88,4 @@ void Window::onEvent(const std::string& ev) {
dp.emit();
}
std::string Window::rewriteTitle(const std::string& title) {
const auto& rules = config_["rewrite"];
if (!rules.isObject()) {
return title;
}
std::string res = title;
for (auto it = rules.begin(); it != rules.end(); ++it) {
if (it.key().isString() && it->isString()) {
try {
// malformated regexes will cause an exception.
// in this case, log error and try the next rule.
const std::regex rule{it.key().asString()};
if (std::regex_match(title, rule)) {
res = std::regex_replace(res, rule, it->asString());
}
} catch (const std::regex_error& e) {
spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
}
}
}
return res;
}
} // namespace waybar::modules::hyprland

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

@ -1,4 +1,5 @@
#include "modules/sway/window.hpp"
#include "util/rewrite_title.hpp"
#include <gdkmm/pixbuf.h>
#include <glibmm/fileutils.h>
@ -175,7 +176,7 @@ auto Window::update() -> void {
bar_.window.get_style_context()->remove_class("solo");
bar_.window.get_style_context()->remove_class("empty");
}
label_.set_markup(fmt::format(format_, fmt::arg("title", rewriteTitle(window_)),
label_.set_markup(fmt::format(format_, fmt::arg("title", waybar::util::rewriteTitle(window_, config_["rewrite"])),
fmt::arg("app_id", app_id_), fmt::arg("shell", shell_)));
if (tooltipEnabled()) {
label_.set_tooltip_text(window_);
@ -262,30 +263,4 @@ void Window::getTree() {
}
}
std::string Window::rewriteTitle(const std::string& title) {
const auto& rules = config_["rewrite"];
if (!rules.isObject()) {
return title;
}
std::string res = title;
for (auto it = rules.begin(); it != rules.end(); ++it) {
if (it.key().isString() && it->isString()) {
try {
// malformated regexes will cause an exception.
// in this case, log error and try the next rule.
const std::regex rule{it.key().asString()};
if (std::regex_match(title, rule)) {
res = std::regex_replace(res, rule, it->asString());
}
} catch (const std::regex_error& e) {
spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
}
}
}
return res;
}
} // namespace waybar::modules::sway

32
src/util/rewrite_title.cpp Normal file
View File

@ -0,0 +1,32 @@
#include "util/rewrite_title.hpp"
#include <spdlog/spdlog.h>
#include <regex>
namespace waybar::util {
std::string rewriteTitle(const std::string& title, const Json::Value& rules) {
if (!rules.isObject()) {
return title;
}
std::string res = title;
for (auto it = rules.begin(); it != rules.end(); ++it) {
if (it.key().isString() && it->isString()) {
try {
// malformated regexes will cause an exception.
// in this case, log error and try the next rule.
const std::regex rule{it.key().asString()};
if (std::regex_match(title, rule)) {
res = std::regex_replace(res, rule, it->asString());
}
} catch (const std::regex_error& e) {
spdlog::error("Invalid rule {}: {}", it.key().asString(), e.what());
}
}
}
return res;
}
} // namespace waybar::util