X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flib%2Fbuilder.cpp;h=c8c7bf81efbccb47726edef19c1ae11417184103;hb=f9f8b6926a842f241edf7db6590af4b47a87bfd3;hp=48f35500667edcf391f6153f64c584fef18604cc;hpb=2c42374a95a76dcb28eaf3e5d85d321fafe62b38;p=builder.git

diff --git a/source/lib/builder.cpp b/source/lib/builder.cpp
index 48f3550..c8c7bf8 100644
--- a/source/lib/builder.cpp
+++ b/source/lib/builder.cpp
@@ -10,6 +10,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "binarypackage.h"
@@ -47,6 +48,7 @@ void Builder::load_plugins()
 
 	FS::Path plugins_dir = FS::get_sys_lib_dir();
 	logger->log("files", "Traversing %s", plugins_dir);
+	vector<LoadedPlugin> unordered_plugins;
 	for(const string &f: list_filtered(plugins_dir, "\\.dlm$"))
 	{
 		LoadedPlugin plugin;
@@ -69,7 +71,7 @@ void Builder::load_plugins()
 			if(plugin.plugin)
 			{
 				logger->log("plugins", "Loaded plugin %s", f);
-				plugins.emplace_back(move(plugin));
+				unordered_plugins.emplace_back(move(plugin));
 				continue;
 			}
 			else
@@ -79,8 +81,40 @@ void Builder::load_plugins()
 		{
 			logger->log("plugins", "Failed to initialize plugin %s: %s", f, exc.what());
 		}
+	}
+
+	auto have_plugin = [this](const string &r){
+		return any_of(plugins.begin(), plugins.end(), [&r](const LoadedPlugin &p){ return FS::basepart(FS::basename(p.path))==r; });
+	};
+
+	while(!unordered_plugins.empty())
+	{
+		bool any_added = false;
+		for(auto i=unordered_plugins.begin(); i!=unordered_plugins.end(); )
+		{
+			const vector<string> &required = i->plugin->get_required_plugins();
+			if(all_of(required.begin(), required.end(), have_plugin))
+			{
+				plugins.push_back(move(*i));
+				i = unordered_plugins.erase(i);
+				any_added = true;
+			}
+			else
+				++i;
+		}
 
-		delete plugin.module;
+		if(!any_added)
+			break;
+	}
+
+	for(const LoadedPlugin &p: unordered_plugins)
+	{
+		vector<string> missing;
+		for(const string &r: p.plugin->get_required_plugins())
+			if(!have_plugin(r))
+				missing.push_back(r);
+		logger->log("plugins", "Missing required plugins for plugin %s: %s",
+			FS::basename(p.path), join(missing.begin(), missing.end()));
 	}
 }
 
@@ -376,6 +410,18 @@ Builder::LoadedPlugin::LoadedPlugin(LoadedPlugin &&other):
 	other.plugin = 0;
 }
 
+Builder::LoadedPlugin &Builder::LoadedPlugin::operator=(LoadedPlugin &&other)
+{
+	delete plugin;
+	delete module;
+	path = move(other.path);
+	module = other.module;
+	plugin = other.plugin;
+	other.module = 0;
+	other.plugin = 0;
+	return *this;
+}
+
 Builder::LoadedPlugin::~LoadedPlugin()
 {
 	delete plugin;