Shuffle some names around in the data tool

[libs/datafile.git] / tool / packer.cpp

diff --git a/tool/packer.cpp b/tool/packer.cpp
index 3576472e57b07baa7f2755e9c8012f5b60d0110e..fa4d7e236a943ba3361507cb5ff0b2bcf559415a 100644 (file)
--- a/tool/packer.cpp
+++ b/tool/packer.cpp
@@ -13,23 +13,25 @@ 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");
+       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 &)
@@ -41,7 +43,6 @@ IO::File *Packer::tempfile()
 
 Packer::~Packer()
 {
-       delete tmp_buf;
        delete tmp_file;
 }
 
@@ -54,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;
 
@@ -74,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
                {
@@ -87,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)
@@ -126,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())
        {
@@ -167,12 +164,14 @@ void Packer::create_pack(const string &fn)
        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;
 }