Expose raw open functionality from Collection

[libs/datafile.git] / source / collection.cpp

diff --git a/source/collection.cpp b/source/collection.cpp
index 070991948d33d7315074ec6bb480cc06344d45cc..cffb7e22e7041ba48268c9643c6d7791e118407f 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include "collection.h"
 
 using namespace std;
@@ -91,15 +92,26 @@ void Collection::add_source(CollectionSource &s)
        sources.push_back(&s);
 }
 
+IO::Seekable *Collection::open_raw(const string &name) const
+{
+       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))
-                               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)
@@ -109,7 +121,16 @@ void Collection::load_items_from_sources(const CollectionItemTypeBase &type)
                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))
-                               (*i)->load(*this, type, *j);
+                       {
+                               bool loaded = false;
+                               if(type.can_create())
+                               {
+                                       type.create_item(*this, *j);
+                                       loaded = items.count(*j);
+                               }
+                               if(!loaded)
+                                       (*i)->load(*this, type, *j);
+                       }
        }
 }