format RegexCollection output using match results

Alexays · Jun 5, 2024 · 76c2f31 · 76c2f31
1 parent 7163752
commit 76c2f31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/include/util/regex_collection.hpp b/include/util/regex_collection.hpp
@@ -36,7 +36,7 @@ class RegexCollection {
   std::map<std::string, std::string> regex_cache;
   std::string default_repr;
 
-  std::string& find_match(std::string& value, bool& matched_any);
+  std::string find_match(std::string& value, bool& matched_any);
 
  public:
   RegexCollection() = default;
@@ -48,4 +48,4 @@ class RegexCollection {
   std::string& get(std::string& value);
 };
 
-}  // namespace waybar::util
+}  // namespace waybar::util
diff --git a/src/util/regex_collection.cpp b/src/util/regex_collection.cpp
@@ -31,11 +31,12 @@ RegexCollection::RegexCollection(const Json::Value& map, std::string default_rep
   std::sort(rules.begin(), rules.end(), [](Rule& a, Rule& b) { return a.priority > b.priority; });
 }
 
-std::string& RegexCollection::find_match(std::string& value, bool& matched_any) {
+std::string RegexCollection::find_match(std::string& value, bool& matched_any) {
   for (auto& rule : rules) {
-    if (std::regex_search(value, rule.rule)) {
+    std::smatch match;
+    if (std::regex_search(value, match, rule.rule)) {
       matched_any = true;
-      return rule.repr;
+      return match.format(rule.repr.data());
     }
   }