Merge pull request #5216 from LukashonakV/enum-refactor

util/enum: make header-only and drop mandatory Hyprland dependency

include/modules/hyprland/workspaces.hpp

@@ -167,9 +167,8 @@ class Workspaces : public AModule, public EventHandler {
   std::map<WindowAddress, WindowRepr, std::less<>> m_orphanWindowMap;
 
   enum class SortMethod { ID, NAME, NUMBER, SPECIAL_CENTERED, DEFAULT };
-  util::EnumParser<SortMethod> m_enumParser;
   SortMethod m_sortBy = SortMethod::DEFAULT;
-  std::map<std::string, SortMethod> m_sortMap = {{"ID", SortMethod::ID},
+  static inline const std::map<std::string, SortMethod> m_sortMap = {{"ID", SortMethod::ID},
                                                  {"NAME", SortMethod::NAME},
                                                  {"NUMBER", SortMethod::NUMBER},
                                                  {"SPECIAL-CENTERED", SortMethod::SPECIAL_CENTERED},
@@ -207,9 +206,8 @@ class Workspaces : public AModule, public EventHandler {
   int m_taskbarMaxIcons = 0;  // 0 means unlimited
   Gtk::Orientation m_taskbarOrientation = Gtk::ORIENTATION_HORIZONTAL;
   bool m_taskbarReverseDirection = false;
-  util::EnumParser<ActiveWindowPosition> m_activeWindowEnumParser;
   ActiveWindowPosition m_activeWindowPosition = ActiveWindowPosition::NONE;
-  std::map<std::string, ActiveWindowPosition> m_activeWindowPositionMap = {
+  static inline std::map<std::string, ActiveWindowPosition> m_activeWindowPositionMap = {
       {"NONE", ActiveWindowPosition::NONE},
       {"FIRST", ActiveWindowPosition::FIRST},
       {"LAST", ActiveWindowPosition::LAST},

include/util/enum.hpp

@@ -1,19 +1,33 @@
 #pragma once
 
+#include <algorithm>
+#include <cctype>
 #include <map>
 #include <stdexcept>
 #include <string>
 
+#include "util/string.hpp"
+
 namespace waybar::util {
 
 template <typename EnumType>
-struct EnumParser {
- public:
-  EnumParser();
-  ~EnumParser();
-
+//struct EnumParser {
   EnumType parseStringToEnum(const std::string& str,
-                             const std::map<std::string, EnumType>& enumMap);
-};
+                             const std::map<std::string, EnumType>& enumMap) {
+    std::string uppercaseStr = capitalize(str);
+    std::map<std::string, EnumType> capitalizedEnumMap;
+    std::transform(
+        enumMap.begin(), enumMap.end(),
+        std::inserter(capitalizedEnumMap, capitalizedEnumMap.end()),
+        [](const auto& pair) {
+          return std::make_pair(capitalize(pair.first), pair.second);
+        });
+
+    auto it = capitalizedEnumMap.find(uppercaseStr);
+    if (it != capitalizedEnumMap.end()) return it->second;
+
+    throw std::invalid_argument("Invalid string representation for enum");
+//  }
+}
 
 }  // namespace waybar::util

include/util/kill_signal.hpp

@@ -13,14 +13,14 @@ enum class KillSignalAction : std::uint8_t {
   HIDE,
   NOOP,
 };
-const std::map<std::string, KillSignalAction> userKillSignalActions = {
+inline const std::map<std::string, KillSignalAction> userKillSignalActions = {
     {"TOGGLE", KillSignalAction::TOGGLE},
     {"RELOAD", KillSignalAction::RELOAD},
     {"SHOW", KillSignalAction::SHOW},
     {"HIDE", KillSignalAction::HIDE},
     {"NOOP", KillSignalAction::NOOP}};
 
-const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR1 = KillSignalAction::TOGGLE;
-const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR2 = KillSignalAction::RELOAD;
+inline const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR1 = KillSignalAction::TOGGLE;
+inline const KillSignalAction SIGNALACTION_DEFAULT_SIGUSR2 = KillSignalAction::RELOAD;
 
 };  // namespace waybar::util