FileMap pack_files;
pack->collect_files(pack_files, filter);
- files.insert(pack_files.begin(), pack_files.end());
for(FileMap::const_iterator i=pack_files.begin(); i!=pack_files.end(); ++i)
+ {
+ files[i->first] = i->second;
i->second->collect_objects(objects);
+ }
}
list<PackSource::FileInfo> PackSource::list_files() const
return;
File &file = i->second->get_file();
- if(file.is_loaded())
- return;
- file.set_loaded();
RefPtr<IO::Base> in = file.open();
Parser parser(*in, file.get_full_name());
filename(fn),
offset(0),
length(0),
- collection(false),
- loaded(false)
+ collection(false)
{ }
RefPtr<IO::Seekable> PackSource::File::open() const
return format("%s/%s", pack.get_filename(), filename);
}
-void PackSource::File::set_loaded()
-{
- loaded = true;
-}
-
void PackSource::File::collect_objects(ObjectMap &objs) const
{
for(list<Object>::const_iterator i=objects.begin(); i!=objects.end(); ++i)