X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fpacksource.cpp;h=1accdb0fc3a384c456f4535db23e164a89efb5b7;hp=c06b270e30d8ecb4ef4fed14840989ae85e5e47f;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hpb=b1bc25649c1f22abf940a807d934f1e9bb780c28

diff --git a/source/packsource.cpp b/source/packsource.cpp
index c06b270..1accdb0 100644
--- a/source/packsource.cpp
+++ b/source/packsource.cpp
@@ -1,19 +1,76 @@
+#include <msp/io/slice.h>
 #include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "collection.h"
 #include "packsource.h"
 
 using namespace std;
 
+namespace {
+
+void delete_io(Msp::IO::Base *io)
+{
+	delete io;
+}
+
+}
+
 namespace Msp {
 namespace DataFile {
 
 void PackSource::add_pack_file(const string &fn)
 {
-	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(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 || (io && i->get_io()==io))
+			pack = &*i;
+	if(!pack)
+	{
+		packs.push_back(Pack(io, fn));
+		pack = &packs.back();
+		if(io)
+		{
+			DataFile::Parser parser(*io, fn);
+			Pack::Loader loader(*pack);
+			loader.load(parser);
+		}
+		else
+			DataFile::load(*pack, fn);
+	}
+
+	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)
+		i->second->collect_objects(objects);
+}
 
-	pack.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
@@ -55,9 +112,6 @@ void PackSource::load(Collection &coll, const CollectionItemTypeBase &type, cons
 		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());
@@ -70,16 +124,36 @@ void PackSource::load(Collection &coll, const CollectionItemTypeBase &type, cons
 		type.load_item(coll, parser, name);
 }
 
+IO::Seekable *PackSource::open(const string &fn) const
+{
+	FileMap::const_iterator i = files.find(fn);
+	if(i!=files.end())
+		return i->second->open().release();
 
-PackSource::Pack::Pack(const string &fn):
+	return 0;
+}
+
+
+PackSource::Pack::Pack(IO::Seekable *i, const string &fn):
 	filename(fn),
+	io(i),
 	base_offset(0)
 { }
 
-void PackSource::Pack::collect_objects(ObjectMap &objs) const
+void PackSource::Pack::collect_files(FileMap &fm, const string &filter) const
 {
-	for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
-		i->collect_objects(objs);
+	if(filter.empty())
+	{
+		for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
+			fm[i->get_filename()] = &*i;
+	}
+	else
+	{
+		Regex re(filter);
+		for(list<File>::const_iterator i=files.begin(); i!=files.end(); ++i)
+			if(re.match(i->get_filename()))
+				fm[i->get_filename()] = &*i;
+	}
 }
 
 
@@ -88,25 +162,34 @@ PackSource::File::File(const Pack &p, const string &fn):
 	filename(fn),
 	offset(0),
 	length(0),
-	collection(false),
-	loaded(false)
+	collection(false)
 { }
 
-RefPtr<IO::Base> PackSource::File::open() const
+RefPtr<IO::Seekable> PackSource::File::open() const
 {
-	RefPtr<IO::BufferedFile> io_file = new IO::BufferedFile(pack.get_filename());
-	io_file->seek(pack.get_base_offset()+offset, IO::S_BEG);
-	return io_file;
+	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;
+	}
 }
 
-string PackSource::File::get_full_name() const
+PackSource::FileInfo PackSource::File::get_info() const
 {
-	return format("%s/%s", pack.get_filename(), filename);
+	FileInfo info;
+	info.name = filename;
+	info.size = length;
+	return info;
 }
 
-void PackSource::File::set_loaded()
+string PackSource::File::get_full_name() const
 {
-	loaded = true;
+	return format("%s/%s", pack.get_filename(), filename);
 }
 
 void PackSource::File::collect_objects(ObjectMap &objs) const