summaryrefslogtreecommitdiff
path: root/modules/commands/ns_set_misc.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2014-11-24 14:27:23 -0500
committerAdam <Adam@anope.org>2014-11-24 14:27:23 -0500
commit42238034490fb5479d787bd1695750387d508200 (patch)
treec93c62e0e1c936e656ae5b9ee1b62380ce2a194c /modules/commands/ns_set_misc.cpp
parentd492923610d9c9146b2a2b63de38deab2cfd4ca7 (diff)
Rewrite serializable to have field level granularity
Represent serializable objects in a digraph, and as a result made most object relationships implicitly defined, and use the graph to trace references between objects to determine relationships. Edges may also be marked as having a dependency of the object they point to, which allows for automatic cleanup and deletion of most objects when no longer needed. Additionally, this allows not having to require in-memory copies of everything when using external databases. db_sql has been rewritten for this and now always requires a database to function. db_sql with MySQL now requires InnoDB to make use of transactions and foreign key constraints.
Diffstat (limited to 'modules/commands/ns_set_misc.cpp')
-rw-r--r--modules/commands/ns_set_misc.cpp164
1 files changed, 76 insertions, 88 deletions
diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index eb8ee63be..8a84a459c 100644
--- a/modules/commands/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
@@ -10,88 +10,82 @@
*/
#include "module.h"
-#include "modules/set_misc.h"
+#include "modules/ns_set_misc.h"
#include "modules/ns_info.h"
#include "modules/ns_set.h"
-static Module *me;
-
static Anope::map<Anope::string> descriptions;
-struct NSMiscData;
-static Anope::map<ExtensibleItem<NSMiscData> *> items;
-
-static ExtensibleItem<NSMiscData> *GetItem(const Anope::string &name)
+class NSMiscDataImpl : public NSMiscData
{
- ExtensibleItem<NSMiscData>* &it = items[name];
- if (!it)
- try
- {
- it = new ExtensibleItem<NSMiscData>(me, name);
- }
- catch (const ModuleException &) { }
- return it;
-}
+ public:
+ NSMiscDataImpl(Serialize::TypeBase *type) : NSMiscData(type) { }
+ NSMiscDataImpl(Serialize::TypeBase *type, Serialize::ID id) : NSMiscData(type, id) { }
-struct NSMiscData : MiscData, Serializable
-{
- NSMiscData(Extensible *) : Serializable("NSMiscData") { }
+ NickServ::Account *GetAccount() override;
+ void SetAccount(NickServ::Account *s) override;
- NSMiscData(NickServ::Account *ncore, const Anope::string &n, const Anope::string &d) : Serializable("NSMiscData")
- {
- object = ncore->display;
- name = n;
- data = d;
- }
+ Anope::string GetName() override;
+ void SetName(const Anope::string &n) override;
- void Serialize(Serialize::Data &sdata) const override
+ Anope::string GetData() override;
+ void SetData(const Anope::string &d) override;
+};
+
+class NSMiscDataType : public Serialize::Type<NSMiscDataImpl>
+{
+ public:
+ Serialize::ObjectField<NSMiscDataImpl, NickServ::Account *> owner;
+ Serialize::Field<NSMiscDataImpl, Anope::string> name, data;
+
+ NSMiscDataType(Module *me) : Serialize::Type<NSMiscDataImpl>(me, "NSMiscData")
+ , owner(this, "nc", true)
+ , name(this, "name")
+ , data(this, "data")
{
- sdata["nc"] << this->object;
- sdata["name"] << this->name;
- sdata["data"] << this->data;
}
+};
- static Serializable* Unserialize(Serializable *obj, Serialize::Data &data)
- {
- Anope::string snc, sname, sdata;
+NickServ::Account *NSMiscDataImpl::GetAccount()
+{
+ return Get(&NSMiscDataType::owner);
+}
- data["nc"] >> snc;
- data["name"] >> sname;
- data["data"] >> sdata;
+void NSMiscDataImpl::SetAccount(NickServ::Account *s)
+{
+ Set(&NSMiscDataType::owner, s);
+}
- NickServ::Account *nc = NickServ::FindAccount(snc);
- if (nc == NULL)
- return NULL;
+Anope::string NSMiscDataImpl::GetName()
+{
+ return Get(&NSMiscDataType::name);
+}
- NSMiscData *d = NULL;
- if (obj)
- {
- d = anope_dynamic_static_cast<NSMiscData *>(obj);
- d->object = nc->display;
- data["name"] >> d->name;
- data["data"] >> d->data;
- }
- else
- {
- ExtensibleItem<NSMiscData> *item = GetItem(sname);
- if (item)
- d = item->Set(nc, NSMiscData(nc, sname, sdata));
- }
+void NSMiscDataImpl::SetName(const Anope::string &n)
+{
+ Set(&NSMiscDataType::name, n);
+}
- return d;
- }
-};
+Anope::string NSMiscDataImpl::GetData()
+{
+ return Get(&NSMiscDataType::data);
+}
-static Anope::string GetAttribute(const Anope::string &command)
+void NSMiscDataImpl::SetData(const Anope::string &d)
{
- size_t sp = command.rfind(' ');
- if (sp != Anope::string::npos)
- return command.substr(sp + 1);
- return command;
+ Set(&NSMiscDataType::data, d);
}
class CommandNSSetMisc : public Command
{
+ Anope::string GetAttribute(const Anope::string &command)
+ {
+ size_t sp = command.rfind(' ');
+ if (sp != Anope::string::npos)
+ return command.substr(sp + 1);
+ return command;
+ }
+
public:
CommandNSSetMisc(Module *creator, const Anope::string &cname = "nickserv/set/misc", size_t min = 0) : Command(creator, cname, min, min + 1)
{
@@ -106,39 +100,46 @@ class CommandNSSetMisc : public Command
return;
}
- const NickServ::Nick *na = NickServ::FindNick(user);
+ NickServ::Nick *na = NickServ::FindNick(user);
if (!na)
{
source.Reply(_("\002{0}\002 isn't registered."), user);
return;
}
- NickServ::Account *nc = na->nc;
+ NickServ::Account *nc = na->GetAccount();
EventReturn MOD_RESULT = Event::OnSetNickOption(&Event::SetNickOption::OnSetNickOption, source, this, nc, param);
if (MOD_RESULT == EVENT_STOP)
return;
Anope::string scommand = GetAttribute(source.command);
- Anope::string key = "ns_set_misc:" + scommand;
- ExtensibleItem<NSMiscData> *item = GetItem(key);
- if (item == NULL)
- return;
+
+ /* remove existing */
+ for (NSMiscData *data : nc->GetRefs<NSMiscData *>(nsmiscdata))
+ if (data->GetName() == scommand)
+ {
+ data->Delete();
+ break;
+ }
if (!param.empty())
{
- item->Set(nc, NSMiscData(nc, key, param));
- source.Reply(_("\002{0}\002 for \002{1}\002 set to \002{2}\002."), scommand, nc->display, param);
+ NSMiscData *data = nsmiscdata.Create();
+ data->SetAccount(nc);
+ data->SetName(scommand);
+ data->SetData(param);
+
+ source.Reply(_("\002{0}\002 for \002{1}\002 set to \002{2}\002."), scommand, nc->GetDisplay(), param);
}
else
{
- item->Unset(nc);
- source.Reply(_("\002{0}\002 for \002{1}\002 unset."), scommand, nc->display);
+ source.Reply(_("\002{0}\002 for \002{1}\002 unset."), scommand, nc->GetDisplay());
}
}
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
- this->Run(source, source.nc->display, !params.empty() ? params[0] : "");
+ this->Run(source, source.nc->GetDisplay(), !params.empty() ? params[0] : "");
}
void OnServHelp(CommandSource &source) override
@@ -181,22 +182,15 @@ class NSSetMisc : public Module
{
CommandNSSetMisc commandnssetmisc;
CommandNSSASetMisc commandnssasetmisc;
- Serialize::Type nsmiscdata_type;
+ NSMiscDataType type;
public:
NSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
, EventHook<Event::NickInfo>("OnNickInfo")
, commandnssetmisc(this)
, commandnssasetmisc(this)
- , nsmiscdata_type("NSMiscData", NSMiscData::Unserialize)
+ , type(this)
{
- me = this;
- }
-
- ~NSSetMisc()
- {
- for (Anope::map<ExtensibleItem<NSMiscData> *>::iterator it = items.begin(); it != items.end(); ++it)
- delete it->second;
}
void OnReload(Configuration::Conf *conf) override
@@ -224,14 +218,8 @@ class NSSetMisc : public Module
void OnNickInfo(CommandSource &source, NickServ::Nick *na, InfoFormatter &info, bool) override
{
- for (Anope::map<ExtensibleItem<NSMiscData> *>::iterator it = items.begin(); it != items.end(); ++it)
- {
- ExtensibleItem<NSMiscData> *e = it->second;
- NSMiscData *data = e->Get(na->nc);
-
- if (data != NULL)
- info[e->name.substr(12).replace_all_cs("_", " ")] = data->data;
- }
+ for (NSMiscData *data : na->GetAccount()->GetRefs<NSMiscData *>(nsmiscdata))
+ info[data->GetName()] = data->GetData();
}
};