Use const sources in Collection

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

diff --git a/source/collection.cpp b/source/collection.cpp
index 165b77007fce815eac0b4498d58950895ca1706d..9f135f0c0ed8eab31c6ffe730b23fd683b69e98e 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -36,15 +36,9 @@ const Variant &Collection::get_var(const string &name, const CollectionItemTypeB
                        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;
-                               }
-               }
+                       if(CollectionItemTypeBase *fb_type = fallback->get_type(*type))
+                               if(fallback->get_status(name, *fb_type))
+                                       return fallback->get_var(name, fb_type);
        }
 
        return get_item(items, name);
@@ -73,12 +67,23 @@ unsigned Collection::get_status(const string &name, const CollectionItemTypeBase
                for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
                        if((*j)->is_loadable(type, name))
                                return 2;
+               if(fallback)
+                       if(CollectionItemTypeBase *fb_type = fallback->get_type(type))
+                               return fallback->get_status(name, *fb_type);
                return 0;
        }
 
        return type.check_item_type(i->second);
 }
 
+CollectionItemTypeBase *Collection::get_type(const CollectionItemTypeBase &type) const
+{
+       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
+               if((*j)->is_same_type(type))
+                       return *j;
+       return 0;
+}
+
 CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
 {
        for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
@@ -87,12 +92,12 @@ CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
        return 0;
 }
 
-void Collection::add_source(CollectionSource &s)
+void Collection::add_source(const CollectionSource &s)
 {
        sources.push_back(&s);
 }
 
-IO::Seekable *Collection::open_from_sources(const string &name)
+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))
@@ -121,7 +126,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);
+                       }
        }
 }