- packs.push_back(Pack(fn));
- Pack &pack = packs.back();
- DataFile::load(pack, fn);
+ add_pack_file(fn, string());
+}
+
+void PackSource::add_pack_file(const string &fn, const string &filter)
+{
+ add_pack(nullptr, 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)
+{
+ auto i = find_if(packs, [io, &fn](const Pack &p){ return p.get_filename()==fn || (io && p.get_io()==io); });
+ if(i==packs.end())
+ {
+ packs.push_back(Pack(io, fn));
+ i = prev(packs.end());
+ if(io)
+ {
+ DataFile::Parser parser(*io, fn);
+ Pack::Loader loader(*i);
+ loader.load(parser);
+ }
+ else
+ DataFile::load(*i, fn);
+ }