Clean up CoreException

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 15e3930997a7b6ae8ba9625bf74356a9fddd57d4..2157d194866cbfd8f365f16bfee334d11fc66007 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -25,7 +25,6 @@
 
 
 #include <iostream>
-#include <fstream>
 #include "inspircd.h"
 #include "xline.h"
 #include "socket.h"
@@ -134,12 +133,10 @@ void              Module::OnUserMessage(User*, void*, int, const std::string&, char, const C
 void           Module::OnUserInvite(User*, User*, Channel*, time_t) { DetachEvent(I_OnUserInvite); }
 void           Module::OnPostTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPostTopicChange); }
 void           Module::OnGetServerDescription(const std::string&, std::string&) { DetachEvent(I_OnGetServerDescription); }
-void           Module::OnSyncUser(User*, Module*, void*) { DetachEvent(I_OnSyncUser); }
-void           Module::OnSyncChannel(Channel*, Module*, void*) { DetachEvent(I_OnSyncChannel); }
-void           Module::OnSyncNetwork(Module*, void*) { DetachEvent(I_OnSyncNetwork); }
-void           Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
+void           Module::OnSyncUser(User*, ProtocolInterface::Server&) { DetachEvent(I_OnSyncUser); }
+void           Module::OnSyncChannel(Channel*, ProtocolInterface::Server&) { DetachEvent(I_OnSyncChannel); }
+void           Module::OnSyncNetwork(ProtocolInterface::Server&) { DetachEvent(I_OnSyncNetwork); }
 void           Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { DetachEvent(I_OnDecodeMetaData); }
-void           Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { }
 void           Module::OnChangeHost(User*, const std::string&) { DetachEvent(I_OnChangeHost); }
 void           Module::OnChangeName(User*, const std::string&) { DetachEvent(I_OnChangeName); }
 void           Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeIdent); }
@@ -163,6 +160,24 @@ ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockadd
 void           Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, std::string&) { DetachEvent(I_OnSendWhoLine); }
 void           Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
 
+ServiceProvider::ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type)
+       : creator(Creator), name(Name), service(Type)
+{
+       if ((ServerInstance) && (ServerInstance->Modules->NewServices))
+               ServerInstance->Modules->NewServices->push_back(this);
+}
+
+void ServiceProvider::DisableAutoRegister()
+{
+       if ((ServerInstance) && (ServerInstance->Modules->NewServices))
+       {
+               ModuleManager::ServiceList& list = *ServerInstance->Modules->NewServices;
+               ModuleManager::ServiceList::iterator it = std::find(list.begin(), list.end(), this);
+               if (it != list.end())
+                       list.erase(it);
+       }
+}
+
 ModuleManager::ModuleManager()
 {
 }
@@ -494,13 +509,15 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 
 void ModuleManager::LoadAll()
 {
-       LoadCoreModules();
+       std::map<std::string, ServiceList> servicemap;
+       LoadCoreModules(servicemap);
 
        ConfigTagList tags = ServerInstance->Config->ConfTags("module");
        for (ConfigIter i = tags.first; i != tags.second; ++i)
        {
                ConfigTag* tag = i->second;
                std::string name = tag->getString("name");
+               this->NewServices = &servicemap[name];
                std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
 
                if (!this->Load(name, true))
@@ -520,6 +537,7 @@ void ModuleManager::LoadAll()
                {
                        ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
                        AttachAll(mod);
+                       AddServices(servicemap[i->first]);
                        mod->init();
                        mod->ReadConfig(confstatus);
                }
@@ -532,6 +550,8 @@ void ModuleManager::LoadAll()
                }
        }
 
+       this->NewServices = NULL;
+
        if (!PrioritizeHooks())
                ServerInstance->Exit(EXIT_STATUS_MODULE);
 }
@@ -541,6 +561,15 @@ std::string& ModuleManager::LastError()
        return LastModuleError;
 }
 
+void ModuleManager::AddServices(const ServiceList& list)
+{
+       for (ServiceList::const_iterator i = list.begin(); i != list.end(); ++i)
+       {
+               ServiceProvider& s = **i;
+               AddService(s);
+       }
+}
+
 void ModuleManager::AddService(ServiceProvider& item)
 {
        switch (item.service)
@@ -680,47 +709,3 @@ Module* ModuleManager::Find(const std::string &name)
        else
                return modfind->second;
 }
-
-FileReader::FileReader(const std::string& filename)
-{
-       Load(filename);
-}
-
-void FileReader::Load(const std::string& filename)
-{
-       // If the file is stored in the file cache then we used that version instead.
-       std::string realName = ServerInstance->Config->Paths.PrependConfig(filename);
-       ConfigFileCache::iterator it = ServerInstance->Config->Files.find(realName);
-       if (it != ServerInstance->Config->Files.end())
-       {
-               this->lines = it->second;
-       }
-       else
-       {
-               lines.clear();
-
-               std::ifstream stream(realName.c_str());
-               if (!stream.is_open())
-                       throw CoreException(filename + " does not exist or is not readable!");
-
-               std::string line;
-               while (std::getline(stream, line))
-               {
-                       lines.push_back(line);
-                       totalSize += line.size() + 2;
-               }
-
-               stream.close();
-       }
-}
-
-std::string FileReader::GetString()
-{
-       std::string buffer;
-       for (file_cache::iterator it = this->lines.begin(); it != this->lines.end(); ++it)
-       {
-               buffer.append(*it);
-               buffer.append("\r\n");
-       }
-       return buffer;
-}