X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tool%2Fpacker.cpp;h=fa4d7e236a943ba3361507cb5ff0b2bcf559415a;hb=52fb63aded47733fa67e871ce0bd360b9eea7468;hp=56dfa0334fb3a93fecad03f77a6a763cb3fb39c1;hpb=9f7ed91d05f6fc92c2142655b5c815c871d11744;p=libs%2Fdatafile.git

diff --git a/tool/packer.cpp b/tool/packer.cpp
index 56dfa03..fa4d7e2 100644
--- a/tool/packer.cpp
+++ b/tool/packer.cpp
@@ -13,11 +13,10 @@ using namespace Msp;
 Packer::Packer(DataTool &t):
 	tool(t),
 	tmp_file(tempfile()),
-	tmp_buf(new IO::Buffered(*tmp_file)),
 	dir_alloc(0)
 { }
 
-IO::File *Packer::tempfile()
+IO::BufferedFile *Packer::tempfile()
 {
 	FS::Path tmpdir;
 	const char *tmp_env = getenv("TMPDIR");
@@ -31,7 +30,7 @@ IO::File *Packer::tempfile()
 		try
 		{
 			FS::Path filename = tmpdir/format("mspdatatool.%d", i);
-			IO::File *file = new IO::File(filename.str(), IO::M_RDWR, IO::File::C_NEW);
+			IO::BufferedFile *file = new IO::BufferedFile(filename.str(), IO::M_RDWR, IO::File::C_NEW);
 			FS::unlink(filename.str());
 			return file;
 		}
@@ -44,7 +43,6 @@ IO::File *Packer::tempfile()
 
 Packer::~Packer()
 {
-	delete tmp_buf;
 	delete tmp_file;
 }
 
@@ -57,14 +55,10 @@ void Packer::pack_file(const string &fn)
 
 	IO::BufferedFile in(fn);
 	ObjectList objects;
-	bool raw = detect_raw(in);
-	if(raw)
-		transfer_raw(in, *tmp_file);
+	if(detect_data(in))
+		transfer_datafile(in, fn, *tmp_file, objects);
 	else
-	{
-		transfer_datafile(in, fn, *tmp_buf, objects);
-		tmp_buf->flush();
-	}
+		transfer_unknown(in, *tmp_file);
 
 	unsigned length = tmp_file->tell()-offset;
 
@@ -77,12 +71,12 @@ void Packer::pack_file(const string &fn)
 	dir_alloc += 100+objects.size()*100;
 }
 
-bool Packer::detect_raw(IO::Seekable &in)
+bool Packer::detect_data(IO::Seekable &in)
 {
 	IO::SeekOffset offset = in.tell();
-	bool raw = false;
+	bool data = true;
 	DataFile::Parser parser(in, "-");
-	while(!raw && parser && in.tell()<10240)
+	while(data && parser && in.tell()<10240)
 	{
 		try
 		{
@@ -90,11 +84,11 @@ bool Packer::detect_raw(IO::Seekable &in)
 		}
 		catch(...)
 		{
-			raw = true;
+			data = false;
 		}
 	}
 	in.seek(offset, IO::S_BEG);
-	return raw;
+	return data;
 }
 
 void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, ObjectList &objects)
@@ -129,7 +123,7 @@ void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, Ob
 	delete writer;
 }
 
-void Packer::transfer_raw(IO::Base &in, IO::Base &out)
+void Packer::transfer_unknown(IO::Base &in, IO::Base &out)
 {
 	while(!in.eof())
 	{