X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tool%2Fpacker.cpp;h=ff69912fe40124fe4d64e37f5d13330b521782c0;hb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;hp=51b7d8f2c433e136a53d27ca2ccba3415ca047f9;hpb=57d8b8c6f07808efdd1b9647d12447c177ce1e7d;p=libs%2Fdatafile.git

diff --git a/tool/packer.cpp b/tool/packer.cpp
index 51b7d8f..ff69912 100644
--- a/tool/packer.cpp
+++ b/tool/packer.cpp
@@ -50,22 +50,63 @@ void Packer::pack_file(const string &fn)
 	if(!tmp_file)
 		throw logic_error("Packer::pack_file");
 
-	unsigned offset = tmp_file->tell();
+	IO::SeekOffset offset = tmp_file->tell();
 
 	IO::BufferedFile in(fn);
+	ObjectList objects;
+	bool raw = detect_raw(in);
+	if(raw)
+		transfer_raw(in, *tmp_file);
+	else
+	{
+		transfer_datafile(in, fn, *tmp_buf, objects);
+		tmp_buf->flush();
+	}
+
+	unsigned length = tmp_file->tell()-offset;
+
+	DataFile::Statement st("file");
+	st.append(FS::basename(fn));
+	st.sub.push_back((DataFile::Statement("slice"), offset, length));
+	for(list<Object>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		st.sub.push_back((DataFile::Statement("object"), i->name, i->keyword));
+	directory.push_back(st);
+	dir_alloc += 100+objects.size()*100;
+}
+
+bool Packer::detect_raw(IO::Seekable &in)
+{
+	IO::SeekOffset offset = in.tell();
+	bool raw = false;
+	DataFile::Parser parser(in, "-");
+	while(!raw && !in.eof() && in.tell()<10240)
+	{
+		try
+		{
+			parser.parse();
+		}
+		catch(...)
+		{
+			raw = true;
+		}
+	}
+	in.seek(offset, IO::S_BEG);
+	return raw;
+}
+
+void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, ObjectList &objects)
+{
 	DataFile::Parser parser(in, fn);
 
-	DataFile::Writer *writer = tool.create_writer(*tmp_buf);
+	DataFile::Writer *writer = tool.create_writer(out);
 
 	bool collection = FS::extpart(fn)==".mdc";
-	std::list<Object> objects;
 	while(parser)
 	{
 		DataFile::Statement st = parser.parse(true);
 		if(st.valid)
 		{
-			bool sys = !st.keyword.compare(0, 2, "__");
-			if(collection && !sys)
+			if(collection && !st.control)
 			{
 				if(st.get_signature()=="s")
 				{
@@ -77,27 +118,24 @@ void Packer::pack_file(const string &fn)
 				else
 					collection = false;
 			}
-			if(!sys || st.keyword=="__src")
+			if(!st.control || st.keyword=="__src")
 				writer->write(st);
 		}
 	}
 	writer->write(DataFile::Statement("__end"));
 	delete writer;
+}
 
-	tmp_buf->flush();
-	unsigned length = tmp_file->tell()-offset;
-
-	DataFile::Statement st("file");
-	st.append(FS::basename(fn));
-	st.sub.push_back((DataFile::Statement("slice"), offset, length));
-	if(collection)
+void Packer::transfer_raw(IO::Base &in, IO::Base &out)
+{
+	while(!in.eof())
 	{
-		for(list<Object>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-			st.sub.push_back((DataFile::Statement("object"), i->name, i->keyword));
-		dir_alloc += objects.size()*100;
+		char buf[4096];
+		unsigned len = in.read(buf, sizeof(buf));
+		if(len==0)
+			break;
+		out.write(buf, len);
 	}
-	directory.push_back(st);
-	dir_alloc += 100;
 }
 
 void Packer::create_pack(const string &fn)