#include <msp/datafile/parser.h>
+#include <msp/datafile/rawdata.h>
#include <msp/datafile/statement.h>
#include <msp/datafile/writer.h>
#include <msp/fs/utils.h>
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");
+ if(tmp_env)
+ tmpdir = tmp_env;
+ else
+ tmpdir = "/tmp";
+
for(unsigned i=0;; ++i)
{
try
{
- std::string filename = format("/tmp/mspdatatool.%d", i);
- /*filename.reserve(25);
- filename.append("/tmp/mspdatatool.");
- for(unsigned i=0; i<8; ++i)
- filename.append(rand());*/
- IO::File *file = new IO::File(filename, IO::M_RDWR, IO::File::C_NEW);
- FS::unlink(filename);
+ FS::Path filename = tmpdir/format("mspdatatool.%d", i);
+ IO::BufferedFile *file = new IO::BufferedFile(filename.str(), IO::M_RDWR, IO::File::C_NEW);
+ FS::unlink(filename.str());
return file;
}
catch(const IO::file_already_exists &)
Packer::~Packer()
{
- delete tmp_buf;
delete tmp_file;
}
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 if(detect_raw(in))
+ transfer_raw_data(in, fn, *tmp_file);
else
- {
- transfer_datafile(in, fn, *tmp_buf, objects);
- tmp_buf->flush();
- }
+ transfer_unknown(in, *tmp_file);
unsigned length = tmp_file->tell()-offset;
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 && !in.eof() && in.tell()<10240)
+ while(data && parser && in.tell()<10240)
{
try
{
}
catch(...)
{
- raw = true;
+ data = false;
}
}
in.seek(offset, IO::S_BEG);
- return raw;
+ return data;
+}
+
+bool Packer::detect_raw(IO::Seekable &in)
+{
+ char header[4] = { };
+ IO::SeekOffset offset = in.tell();
+ in.read(header, sizeof(header));
+ in.seek(offset, IO::S_BEG);
+ return DataFile::RawData::detect_signature(string(header, sizeof(header)));
}
void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, ObjectList &objects)
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")
{
else
collection = false;
}
- if(!sys || st.keyword=="__src")
+ if(!st.control || st.keyword=="__src")
writer->write(st);
}
}
delete writer;
}
-void Packer::transfer_raw(IO::Base &in, IO::Base &out)
+void Packer::transfer_raw_data(IO::Base &in, const string &fn, IO::Base &out)
+{
+ DataFile::RawData raw;
+ raw.open_io(in, fn);
+ raw.load();
+ raw.write_io(out, tool.is_compressed());
+}
+
+void Packer::transfer_unknown(IO::Base &in, IO::Base &out)
{
while(!in.eof())
{
IO::File out(fn, IO::M_WRITE);
out.write(&dir_buffer[0], base_offset);
tmp_file->seek(0, IO::S_BEG);
+ unsigned bufsize = 1048576;
+ char *buf = new char[bufsize];
while(!tmp_file->eof())
{
- char buf[16384];
- unsigned len = tmp_file->read(buf, sizeof(buf));
+ unsigned len = tmp_file->read(buf, bufsize);
if(!len)
break;
out.write(buf, len);
}
+ delete[] buf;
}