X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpacksource.cpp;h=fe9e67db6eabae37ae1b38278d68104b305f2739;hb=010737b64c8d4e7fcf0fe953ed15769eeac4178f;hp=d054e1d4ee9e50ef99c8d9c136aee978237113bf;hpb=835fcd2f79e8848fa0d92be667c0e02952e23436;p=libs%2Fdatafile.git

diff --git a/source/packsource.cpp b/source/packsource.cpp
index d054e1d..fe9e67d 100644
--- a/source/packsource.cpp
+++ b/source/packsource.cpp
@@ -1,3 +1,4 @@
+#include <msp/io/slice.h>
 #include <msp/strings/format.h>
 #include <msp/strings/regex.h>
 #include "collection.h"
@@ -5,6 +6,15 @@
 
 using namespace std;
 
+namespace {
+
+void delete_io(Msp::IO::Base *io)
+{
+	delete io;
+}
+
+}
+
 namespace Msp {
 namespace DataFile {
 
@@ -14,24 +24,55 @@ void PackSource::add_pack_file(const string &fn)
 }
 
 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;
 	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);
 }
 
+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);
@@ -86,9 +127,19 @@ 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();
+
+	return 0;
+}
 
-PackSource::Pack::Pack(const string &fn):
+
+PackSource::Pack::Pack(IO::Seekable *i, const string &fn):
 	filename(fn),
+	io(i),
 	base_offset(0)
 { }
 
@@ -118,11 +169,26 @@ PackSource::File::File(const Pack &p, const string &fn):
 	loaded(false)
 { }
 
-RefPtr<IO::Base> PackSource::File::open() const
+RefPtr<IO::Seekable> PackSource::File::open() const
+{
+	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
 {
-	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;
+	FileInfo info;
+	info.name = filename;
+	info.size = length;
+	return info;
 }
 
 string PackSource::File::get_full_name() const