X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fcollection.cpp;h=65b4d5a3914192192f2092425e686b7d8ee56576;hp=a16ae5a9dc2e7a9f70f638093348b59c8bd561eb;hb=619629ce1ce6343630b967c9fb46ab43256ddfe1;hpb=495920e971324d29bd4933b8a319fb5668ca5562

diff --git a/source/collection.cpp b/source/collection.cpp
index a16ae5a..65b4d5a 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include "collection.h"
 
 using namespace std;
@@ -5,26 +6,137 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
+Collection::Collection():
+	fallback(0)
+{ }
+
 Collection::~Collection()
 {
 	for(TypeList::iterator i = types.begin(); i!=types.end(); ++i)
 		delete *i;
 }
 
-void Collection::add_future(const std::string &name)
+const Variant &Collection::get_var(const string &name, const CollectionItemTypeBase *type)
 {
-	if(items.count(name))
-		throw key_error(typeid(ItemMap));
+	ItemMap::iterator i = items.find(name);
+	if(i!=items.end())
+		return i->second;
 
-	for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
-		if((*i)->match_name(name))
+	if(type)
+	{
+		bool loaded = false;
+		if(type->can_create())
+		{
+			type->create_item(*this, name);
+			loaded = items.count(name);
+		}
+		for(SourceList::iterator j=sources.begin(); (!loaded && j!=sources.end()); ++j)
+		{
+			(*j)->load(*this, *type, name);
+			loaded = items.count(name);
+		}
+		if(!loaded && fallback)
+		{
+			for(TypeList::const_iterator j=fallback->types.begin(); j!=fallback->types.end(); ++j)
+				if((*j)->is_same_type(*type))
+				{
+					if(fallback->get_status(name, **j))
+						return fallback->get_var(name, *j);
+					break;
+				}
+		}
+	}
+
+	return get_item(items, name);
+}
+
+void Collection::gather_items(list<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
+{
+	for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
+		if(type.check_item_type(i->second))
 		{
-			items.insert(ItemMap::value_type(name, (*i)->create_future()));
-			return;
+			if(vars)
+				vars->push_back(&i->second);
+			if(names)
+				names->push_back(i->first);
 		}
 
-	/* XXX throw something?  If we do, DirectoryCollection needs some way to
-	check if a name matches any item type. */
+	if(include_sources && names)
+		gather_names_from_sources(*names, type);
+}
+
+unsigned Collection::get_status(const string &name, const CollectionItemTypeBase &type) const
+{
+	ItemMap::const_iterator i = items.find(name);
+	if(i==items.end())
+	{
+		for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
+			if((*j)->is_loadable(type, name))
+				return 2;
+		return 0;
+	}
+
+	return type.check_item_type(i->second);
+}
+
+CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
+{
+	for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
+		if((*i)->check_item_type(var))
+			return *i;
+	return 0;
+}
+
+void Collection::add_source(CollectionSource &s)
+{
+	sources.push_back(&s);
+}
+
+IO::Seekable *Collection::open_from_sources(const string &name)
+{
+	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+		if(IO::Seekable *io = (*i)->open(name))
+			return io;
+
+	return 0;
+}
+
+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))
+				new_names.insert(*j);
+	}
+	names.insert(names.end(), new_names.begin(), new_names.end());
+}
+
+void Collection::load_items_from_sources(const CollectionItemTypeBase &type)
+{
+	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))
+			{
+				bool loaded = false;
+				if(type.can_create())
+				{
+					type.create_item(*this, *j);
+					loaded = items.count(*j);
+				}
+				if(!loaded)
+					(*i)->load(*this, type, *j);
+			}
+	}
+}
+
+void Collection::set_fallback(Collection *f)
+{
+	fallback = f;
 }
 
 
@@ -36,13 +148,10 @@ Collection::Loader::Loader(Collection &c):
 }
 
 
-CollectionItemTypeBase::CollectionItemTypeBase():
-	tag(0)
-{ }
-
 CollectionItemTypeBase::~CollectionItemTypeBase()
 {
-	delete tag;
+	for(vector<ExtractorBase *>::iterator i=extractors.begin(); i!=extractors.end(); ++i)
+		delete *i;
 }
 
 void CollectionItemTypeBase::set_keyword(const string &k)