Merge pull request #4907 from jaypikay/master

hostname dependend module

include/util/hosts_check.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <json/value.h>
+
+namespace waybar::util {
+bool valid_host(const Json::Value& config);
+}  // namespace waybar::util

meson.build

@@ -182,6 +182,7 @@ src_files = files(
     'src/util/ustring_clen.cpp',
     'src/util/sanitize_str.cpp',
     'src/util/rewrite_string.cpp',
+    'src/util/hosts_check.cpp',
     'src/util/gtk_icon.cpp',
     'src/util/icon_loader.cpp',
     'src/util/regex_collection.cpp',

src/bar.cpp

@@ -3,12 +3,14 @@
 #include <gtk-layer-shell.h>
 #include <spdlog/spdlog.h>
 
+#include <ostream>
 #include <type_traits>
 
 #include "client.hpp"
 #include "factory.hpp"
 #include "group.hpp"
 #include "util/enum.hpp"
+#include "util/hosts_check.hpp"
 #include "util/kill_signal.hpp"
 
 #ifdef HAVE_SWAY
@@ -565,6 +567,11 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos,
     for (const auto& name : module_list) {
       try {
         auto ref = name.asString();
+
+        if (config[ref].isMember("hosts") && !waybar::util::valid_host(config[ref])) {
+          continue;
+        }
+
         AModule* module;
 
         if (ref.compare(0, 6, "group/") == 0 && ref.size() > 6) {

src/util/hosts_check.cpp

@@ -0,0 +1,17 @@
+#include "util/hosts_check.hpp"
+
+#include <glibmm/miscutils.h>
+#include <json/config.h>
+
+namespace waybar::util {
+bool valid_host(const Json::Value& config) {
+  if (config.isMember("hosts") && config["hosts"].isArray()) {
+    const auto hostname = Glib::get_host_name();
+
+    if (!std::ranges::any_of(config["hosts"].begin(), config["hosts"].end(),
+                             [&](const auto& h) { return h.asString() == hostname; }))
+      return false;
+  }
+  return true;
+}
+}  // namespace waybar::util