loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cyclic error messages now detail the cycle.

Browse Source 
Closes #166.
This commit is contained in:
WrinklyNinja
2014-06-05 17:13:58 +01:00
parent eec1b64e17
commit 7bdc33a180
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/graph.cpp
+17 -2
View File
@@ -42,12 +42,27 @@ namespace loot {
cycle_detector::cycle_detector() {}
void cycle_detector::tree_edge(edge_t e, const PluginGraph& g) {
vertex_t source = boost::source(e, g);
trail.push_back(g[source].Name());
}
void cycle_detector::back_edge(edge_t e, const PluginGraph& g) {
vertex_t vSource = boost::source(e, g);
vertex_t vTarget = boost::target(e, g);
BOOST_LOG_TRIVIAL(error) << "Cyclic interaction detected between plugins \"" << g[vSource].Name() << "\" and \"" << g[vTarget].Name() << "\".";
throw loot::error(loot::error::sorting_error, (boost::format(lc::translate("Cyclic interaction detected between plugins \"%1%\" and \"%2%\".")) % g[vSource].Name() % g[vTarget].Name()).str());
trail.push_back(g[vSource].Name());
list<string>::iterator it = find(trail.begin(), trail.end(), g[vTarget].Name());
string backCycle;
for (list<string>::iterator endIt = trail.end(); it != endIt; ++it) {
backCycle += *it + ", ";
}
backCycle.erase(backCycle.length() - 2);
BOOST_LOG_TRIVIAL(error) << "Cyclic interaction detected between plugins \"" << g[vSource].Name() << "\" and \"" << g[vTarget].Name() << "\". Back cycle: " << backCycle;
throw loot::error(loot::error::sorting_error, (boost::format(lc::translate("Cyclic interaction detected between plugins \"%1%\" and \"%2%\". Back cycle: %3%")) % g[vSource].Name() % g[vTarget].Name() % backCycle).str());
}
bool GetVertexByName(const PluginGraph& graph, const std::string& name, vertex_t& vertex) {
src/backend/graph.h
+3
View File
@@ -45,6 +45,9 @@ namespace loot {
struct cycle_detector : public boost::dfs_visitor<> {
cycle_detector();
std::list<std::string> trail;
void tree_edge(edge_t e, const PluginGraph& g);
void back_edge(edge_t e, const PluginGraph& g);
};