From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 12 Oct 2013 15:21:30 +0000 (+0300)
Subject: Avoid duplicate names if an item is available from multiple sources
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2af11bfb5184092e58cb9a0055ae03a271af28cb;p=libs%2Fdatafile.git

Avoid duplicate names if an item is available from multiple sources
---

diff --git a/source/collection.cpp b/source/collection.cpp
index aa607bd..165b770 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include "collection.h"
 
 using namespace std;
@@ -102,13 +103,15 @@ IO::Seekable *Collection::open_from_sources(const string &name)
 
 void Collection::gather_names_from_sources(list<string> &names, const CollectionItemTypeBase &type) const
 {
+	set<string> new_names;
 	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
 	{
 		std::list<std::string> available_names = (*i)->get_names(type);
 		for(std::list<std::string>::iterator j=available_names.begin(); j!=available_names.end(); ++j)
 			if(!items.count(*j))
-				names.push_back(*j);
+				new_names.insert(*j);
 	}
+	names.insert(names.end(), new_names.begin(), new_names.end());
 }
 
 void Collection::load_items_from_sources(const CollectionItemTypeBase &type)