Mercurial > irccd

changeset 626:c6000e13ab02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Irccd: prefix get_ (rule)
author David Demelier <markand@malikania.fr>
date Fri, 22 Dec 2017 22:05:00 +0100
parents 94ae26cd3cf8
children 8c0942ee6e63
files libirccd/irccd/daemon/rule.cpp libirccd/irccd/daemon/rule.hpp libirccd/irccd/daemon/rule_edit_command.cpp libirccd/irccd/daemon/rule_service.cpp tests/src/libirccd/command-rule-edit/main.cpp tests/src/libirccd/command-rule-info/main.cpp tests/src/libirccd/command-rule-list/main.cpp tests/src/libirccd/command-rule-move/main.cpp tests/src/libirccd/command-rule-remove/main.cpp tests/src/libirccd/rules/main.cpp
diffstat 10 files changed, 64 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/libirccd/irccd/daemon/rule.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/libirccd/irccd/daemon/rule.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -28,7 +28,7 @@
     return value.empty() || set.empty() || set.count(value) == 1;
 }
 
-rule::rule(set servers, set channels, set origins, set plugins, set events, action_type action)
+rule::rule(set servers, set channels, set origins, set plugins, set events, action action)
     : servers_(std::move(servers))
     , channels_(std::move(channels))
     , origins_(std::move(origins))
--- a/libirccd/irccd/daemon/rule.hpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/libirccd/irccd/daemon/rule.hpp	Fri Dec 22 22:05:00 2017 +0100
@@ -47,7 +47,7 @@
     /**
      * \brief Rule action type.
      */
-    enum class action_type {
+    enum class action {
         accept,         //!< The event is accepted (default)
         drop            //!< The event is dropped
     };
@@ -58,7 +58,7 @@
     set origins_;
     set plugins_;
     set events_;
-    action_type action_{action_type::accept};
+    action action_{action::accept};
 
     /*
      * Check if a set contains the value and return true if it is or return
@@ -83,7 +83,7 @@
          set nicknames = {},
          set plugins = {},
          set events = {},
-         action_type action = action_type::accept);
+         action action = action::accept);
 
     /**
      * Check if that rule apply for the given criterias.
@@ -106,7 +106,7 @@
      *
      * \return the action
      */
-    inline action_type action() const noexcept
+    inline action get_action() const noexcept
     {
         return action_;
     }
@@ -116,9 +116,9 @@
      *
      * \pre action must be valid
      */
-    inline void set_action(action_type action) noexcept
+    inline void set_action(action action) noexcept
     {
-        assert(action == action_type::accept || action == action_type::drop);
+        assert(action == action::accept || action == action::drop);
 
         action_ = action;
     }
@@ -128,7 +128,7 @@
      *
      * \return the servers
      */
-    inline const set& servers() const noexcept
+    inline const set& get_servers() const noexcept
     {
         return servers_;
     }
@@ -138,7 +138,7 @@
      *
      * \return the servers
      */
-    inline set& servers() noexcept
+    inline set& get_servers() noexcept
     {
         return servers_;
     }
@@ -148,7 +148,7 @@
      *
      * \return the channels
      */
-    inline const set& channels() const noexcept
+    inline const set& get_channels() const noexcept
     {
         return channels_;
     }
@@ -158,7 +158,7 @@
      *
      * \return the channels
      */
-    inline set& channels() noexcept
+    inline set& get_channels() noexcept
     {
         return channels_;
     }
@@ -168,7 +168,17 @@
      *
      * \return the origins
      */
-    inline const set& origins() const noexcept
+    inline const set& get_origins() const noexcept
+    {
+        return origins_;
+    }
+
+    /**
+     * Overloaded function.
+     *
+     * \return the origins
+     */
+    inline set& get_origins() noexcept
     {
         return origins_;
     }
@@ -178,7 +188,7 @@
      *
      * \return the plugins
      */
-    inline const set& plugins() const noexcept
+    inline const set& get_plugins() const noexcept
     {
         return plugins_;
     }
@@ -188,7 +198,7 @@
      *
      * \return the plugins
      */
-    inline set& plugins() noexcept
+    inline set& get_plugins() noexcept
     {
         return plugins_;
     }
@@ -198,7 +208,7 @@
      *
      * \return the events
      */
-    inline const set& events() const noexcept
+    inline const set& get_events() const noexcept
     {
         return events_;
     }
@@ -208,7 +218,7 @@
      *
      * \return the events
      */
-    inline set& events() noexcept
+    inline set& get_events() noexcept
     {
         return events_;
     }
--- a/libirccd/irccd/daemon/rule_edit_command.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/libirccd/irccd/daemon/rule_edit_command.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -47,10 +47,10 @@
     auto index = irccd.rules().get_index(args);
     auto rule = irccd.rules().require(index);
 
-    updateset(rule.channels(), args, "channels");
-    updateset(rule.events(), args, "events");
-    updateset(rule.plugins(), args, "plugins");
-    updateset(rule.servers(), args, "servers");
+    updateset(rule.get_channels(), args, "channels");
+    updateset(rule.get_events(), args, "events");
+    updateset(rule.get_plugins(), args, "plugins");
+    updateset(rule.get_servers(), args, "servers");
 
     auto action = args.find("action");
 
@@ -59,9 +59,9 @@
             throw rule_error(rule_error::error::invalid_action);
 
         if (action->get<std::string>() == "accept")
-            rule.set_action(rule::action_type::accept);
+            rule.set_action(rule::action::accept);
         else if (action->get<std::string>() == "drop")
-            rule.set_action(rule::action_type::drop);
+            rule.set_action(rule::action::drop);
         else
             throw rule_error(rule_error::invalid_action);
     }
--- a/libirccd/irccd/daemon/rule_service.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/libirccd/irccd/daemon/rule_service.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -39,7 +39,7 @@
     };
 
     rule::set servers, channels, origins, plugins, events;
-    rule::action_type action = rule::action_type::accept;
+    rule::action action = rule::action::accept;
 
     // Get the sets.
     ini::section::const_iterator it;
@@ -59,9 +59,9 @@
     auto actionstr = sc.get("action").value();
 
     if (actionstr == "drop")
-        action = rule::action_type::drop;
+        action = rule::action::drop;
     else if (actionstr == "accept")
-        action = rule::action_type::accept;
+        action = rule::action::accept;
     else
         throw rule_error(rule_error::invalid_action);
 
@@ -96,9 +96,9 @@
 
         auto s = v.template get<std::string>();
         if (s == "accept")
-            return rule::action_type::accept;
+            return rule::action::accept;
         if (s == "drop")
-            return rule::action_type::drop;
+            return rule::action::drop;
 
         throw rule_error(rule_error::invalid_action);
     };
@@ -135,7 +135,7 @@
     };
     auto str = [] (auto action) {
         switch (action) {
-        case rule::action_type::accept:
+        case rule::action::accept:
             return "accept";
         default:
             return "drop";
@@ -143,11 +143,11 @@
     };
 
     return {
-        { "servers",    join(rule.servers())    },
-        { "channels",   join(rule.channels())   },
-        { "plugins",    join(rule.plugins())    },
-        { "events",     join(rule.events())     },
-        { "action",     str(rule.action())      }
+        { "servers",    join(rule.get_servers())    },
+        { "channels",   join(rule.get_channels())   },
+        { "plugins",    join(rule.get_plugins())    },
+        { "events",     join(rule.get_events())     },
+        { "action",     str(rule.get_action())      }
     };
 }
 
@@ -204,18 +204,18 @@
 
     int i = 0;
     for (const auto& rule : rules_) {
-        auto action = rule.action() == rule::action_type::accept ? "accept" : "drop";
+        auto action = rule.get_action() == rule::action::accept ? "accept" : "drop";
 
         irccd_.log().debug() << "  candidate "   << i++ << ":\n"
-            << "    servers: "  << string_util::join(rule.servers()) << "\n"
-            << "    channels: " << string_util::join(rule.channels()) << "\n"
-            << "    origins: "  << string_util::join(rule.origins()) << "\n"
-            << "    plugins: "  << string_util::join(rule.plugins()) << "\n"
-            << "    events: "   << string_util::join(rule.events()) << "\n"
+            << "    servers: "  << string_util::join(rule.get_servers()) << "\n"
+            << "    channels: " << string_util::join(rule.get_channels()) << "\n"
+            << "    origins: "  << string_util::join(rule.get_origins()) << "\n"
+            << "    plugins: "  << string_util::join(rule.get_plugins()) << "\n"
+            << "    events: "   << string_util::join(rule.get_events()) << "\n"
             << "    action: "   << action << std::endl;
 
         if (rule.match(server, channel, origin, plugin, event))
-            result = rule.action() == rule::action_type::accept;
+            result = rule.get_action() == rule::action::accept;
     }
 
     return result;
--- a/tests/src/libirccd/command-rule-edit/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/command-rule-edit/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -41,7 +41,7 @@
             { "o1", "o2" },
             { "p1", "p2" },
             { "onMessage", "onCommand" },
-            rule::action_type::drop
+            rule::action::drop
         ));
     }
 };
--- a/tests/src/libirccd/command-rule-info/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/command-rule-info/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -40,7 +40,7 @@
             { "o1", "o2" },
             { "p1", "p2" },
             { "onMessage", "onCommand" },
-            rule::action_type::drop
+            rule::action::drop
         ));
         daemon_->rules().add(rule(
             { "s1", },
@@ -48,7 +48,7 @@
             { "o1", },
             { "p1", },
             { "onMessage", },
-            rule::action_type::accept
+            rule::action::accept
         ));
     }
 };
--- a/tests/src/libirccd/command-rule-list/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/command-rule-list/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -40,7 +40,7 @@
             { "o1", "o2" },
             { "p1", "p2" },
             { "onMessage", "onCommand" },
-            rule::action_type::drop
+            rule::action::drop
         ));
         daemon_->rules().add(rule(
             { "s1", },
@@ -48,7 +48,7 @@
             { "o1", },
             { "p1", },
             { "onMessage", },
-            rule::action_type::accept
+            rule::action::accept
         ));
     }
 };
--- a/tests/src/libirccd/command-rule-move/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/command-rule-move/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -41,7 +41,7 @@
             { "o0" },
             { "p0" },
             { "onMessage" },
-            rule::action_type::drop
+            rule::action::drop
         ));
         daemon_->rules().add(rule(
             { "s1", },
@@ -49,7 +49,7 @@
             { "o1", },
             { "p1", },
             { "onMessage", },
-            rule::action_type::accept
+            rule::action::accept
         ));
         daemon_->rules().add(rule(
             { "s2", },
@@ -57,7 +57,7 @@
             { "o2", },
             { "p2", },
             { "onMessage", },
-            rule::action_type::accept
+            rule::action::accept
         ));
     }
 };
--- a/tests/src/libirccd/command-rule-remove/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/command-rule-remove/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -41,7 +41,7 @@
             { "o1", "o2" },
             { "p1", "p2" },
             { "onMessage", "onCommand" },
-            rule::action_type::drop
+            rule::action::drop
         ));
         daemon_->rules().add(rule(
             { "s1", },
@@ -49,7 +49,7 @@
             { "o1", },
             { "p1", },
             { "onMessage", },
-            rule::action_type::accept
+            rule::action::accept
         ));
     }
 };
--- a/tests/src/libirccd/rules/main.cpp	Fri Dec 22 21:40:10 2017 +0100
+++ b/tests/src/libirccd/rules/main.cpp	Fri Dec 22 22:05:00 2017 +0100
@@ -83,7 +83,7 @@
                 rule::set{                }, // Origins
                 rule::set{                }, // Plugins
                 rule::set{ "onCommand"    }, // Events
-                rule::action_type::drop
+                rule::action::drop
             });
         }
 
@@ -95,7 +95,7 @@
                 rule::set{                },
                 rule::set{                },
                 rule::set{ "onCommand"    },
-                rule::action_type::accept
+                rule::action::accept
             });
         }
 
@@ -107,7 +107,7 @@
                 rule::set{},
                 rule::set{"game"},
                 rule::set{},
-                rule::action_type::drop
+                rule::action::drop
             });
         }
 
@@ -119,7 +119,7 @@
                 rule::set{                            },
                 rule::set{ "game"                     },
                 rule::set{ "onCommand", "onMessage"   },
-                rule::action_type::accept
+                rule::action::accept
             });
         }
     }