}
void PackSource::add_pack_file(const string &fn, const string &filter)
+{
+ add_pack(0, fn, filter);
+}
+
+void PackSource::add_pack_io(IO::Seekable &io, const string &fn)
+{
+ add_pack(&io, fn, string());
+}
+
+void PackSource::add_pack_io(IO::Seekable &io, const string &fn, const string &filter)
+{
+ add_pack(&io, fn, filter);
+}
+
+void PackSource::add_pack(IO::Seekable *io, const string &fn, const string &filter)
{
Pack *pack = 0;
for(list<Pack>::iterator i=packs.begin(); (!pack && i!=packs.end()); ++i)
- if(i->get_filename()==fn)
+ if(i->get_filename()==fn || (io && i->get_io()==io))
pack = &*i;
if(!pack)
{
- packs.push_back(Pack(fn));
+ packs.push_back(Pack(io, fn));
pack = &packs.back();
- DataFile::load(*pack, fn);
+ if(io)
+ {
+ DataFile::Parser parser(*io, fn);
+ Pack::Loader loader(*pack);
+ loader.load(parser);
+ }
+ else
+ DataFile::load(*pack, fn);
}
FileMap pack_files;
i->second->collect_objects(objects);
}
+list<PackSource::FileInfo> PackSource::list_files() const
+{
+ list<FileInfo> result;
+ for(FileMap::const_iterator i=files.begin(); i!=files.end(); ++i)
+ result.push_back(i->second->get_info());
+ return result;
+}
+
bool PackSource::is_loadable(const CollectionItemTypeBase &type, const string &name) const
{
ObjectMap::const_iterator i = objects.find(name);
}
-PackSource::Pack::Pack(const string &fn):
+PackSource::Pack::Pack(IO::Seekable *i, const string &fn):
filename(fn),
+ io(i),
base_offset(0)
{ }
RefPtr<IO::Seekable> PackSource::File::open() const
{
- IO::BufferedFile *io_file = new IO::BufferedFile(pack.get_filename());
- IO::Slice *io_slice = new IO::Slice(*io_file, pack.get_base_offset()+offset, length);
- io_slice->signal_deleted.connect(sigc::bind(sigc::ptr_fun(delete_io), io_file));
- return io_slice;
+ if(pack.get_io())
+ // TODO Performance may be poor without buffering
+ return new IO::Slice(*pack.get_io(), pack.get_base_offset()+offset, length);
+ else
+ {
+ IO::BufferedFile *io_file = new IO::BufferedFile(pack.get_filename());
+ IO::Slice *io_slice = new IO::Slice(*io_file, pack.get_base_offset()+offset, length);
+ io_slice->signal_deleted.connect(sigc::bind(sigc::ptr_fun(delete_io), io_file));
+ return io_slice;
+ }
+}
+
+PackSource::FileInfo PackSource::File::get_info() const
+{
+ FileInfo info;
+ info.name = filename;
+ info.size = length;
+ return info;
}
string PackSource::File::get_full_name() const