Add an unpack option to the data tool

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

diff --git a/tool/tool.cpp b/tool/tool.cpp
index 5469106f50322b7497ea9626c5a4b2400187aa1c..73c49f7433ad6631a2f32a42607f79736fde68b2 100644 (file)
--- a/tool/tool.cpp
+++ b/tool/tool.cpp
@@ -2,9 +2,11 @@
 #include <msp/io/buffered.h>
 #include <msp/io/console.h>
 #include <msp/io/file.h>
+#include <msp/datafile/packsource.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/statement.h>
 #include "compiler.h"
+#include "packer.h"
 #include "tool.h"
 
 using namespace std;
@@ -16,25 +18,46 @@ DataTool::DataTool(int argc, char **argv):
        compile(false),
        float_size(0),
        compress(false),
+       pack(false),
+       unpack(false),
        debug(false)
 {
        GetOpt getopt;
-       getopt.add_option('b', "binary", binary, GetOpt::NO_ARG);
-       getopt.add_option('c', "compile", compile, GetOpt::NO_ARG);
-       getopt.add_option('f', "float-size", float_size, GetOpt::REQUIRED_ARG);
-       getopt.add_option('g', "debug", debug, GetOpt::NO_ARG);
-       getopt.add_option('o', "output", out_fn, GetOpt::REQUIRED_ARG);
-       getopt.add_option('z', "compress", compress, GetOpt::NO_ARG);
+       getopt.add_option('b', "binary", binary, GetOpt::NO_ARG).set_help("Produce a binary datafile");
+       getopt.add_option('c', "compile", compile, GetOpt::NO_ARG).set_help("Create a collection based on a template file");
+       getopt.add_option('f', "float-size", float_size, GetOpt::REQUIRED_ARG).set_help("Floating-point precision", "BITS");
+       getopt.add_option('g', "debug", debug, GetOpt::NO_ARG).set_help("Display control statements");
+       getopt.add_option('o', "output", out_fn, GetOpt::REQUIRED_ARG).set_help("Output to a file instead of stdout", "FILE");
+       getopt.add_option('p', "pack", pack, GetOpt::NO_ARG).set_help("Create a pack from multiple files");
+       getopt.add_option('u', "unpack", unpack, GetOpt::NO_ARG).set_help("Unpacks files from packs into the current directory");
+       getopt.add_option('z', "compress", compress, GetOpt::NO_ARG).set_help("Produce a compressed datafile");
+       getopt.add_argument("infile", in_fns, GetOpt::OPTIONAL_ARG).set_help("Files to process");
        getopt(argc, argv);
 
-       in_fns = getopt.get_args();
+       if(compile+pack+unpack>1)
+               throw usage_error("Only one of -c, -p and -u may be specified");
+
+       if(pack && out_fn=="-")
+               throw usage_error("Can't write pack to stdout");
+
        if(in_fns.empty())
                in_fns.push_back("-");
+
+       if(unpack)
+       {
+               for(list<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+                       if(*i=="-")
+                               throw usage_error("Can't unpack from stdout");
+       }
 }
 
 int DataTool::main()
 {
-       if(compile)
+       if(pack)
+               do_pack();
+       else if(unpack)
+               do_unpack();
+       else if(compile)
                do_compile();
        else
                do_transfer();
@@ -47,7 +70,7 @@ void DataTool::do_transfer()
        IO::Base *out = open_output(out_fn);
        DataFile::Writer *writer = create_writer(*out);
 
-       for(vector<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+       for(list<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
        {
                IO::Base *in = open_input(*i);
                DataFile::Parser parser(*in, *i);
@@ -55,7 +78,7 @@ void DataTool::do_transfer()
                while(parser)
                {
                        DataFile::Statement st = parser.parse(true);
-                       if(st.valid && (st.keyword.compare(0, 2, "__") || st.keyword=="__src" || debug))
+                       if(st.valid && (!st.control || st.keyword=="__src" || debug))
                                writer->write(st);
                }
 
@@ -72,7 +95,7 @@ void DataTool::do_compile()
        DataFile::Writer *writer = create_writer(*out);
 
        Compiler compiler(*writer);
-       for(vector<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+       for(list<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
        {
                IO::Base *in = open_input(*i);
                DataFile::Parser parser(*in, *i);
@@ -84,6 +107,38 @@ void DataTool::do_compile()
        delete out;
 }
 
+void DataTool::do_pack()
+{
+       Packer packer(*this);
+       for(list<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+               packer.pack_file(*i);
+       packer.create_pack(out_fn);
+}
+
+void DataTool::do_unpack()
+{
+       DataFile::PackSource source;
+       for(list<string>::const_iterator i=in_fns.begin(); i!=in_fns.end(); ++i)
+               source.add_pack_file(*i);
+
+       list<DataFile::PackSource::FileInfo> files = source.list_files();
+       for(list<DataFile::PackSource::FileInfo>::const_iterator i=files.begin(); i!=files.end(); ++i)
+       {
+               IO::Seekable *in = source.open(i->name);
+               IO::Base *out = open_output(i->name);
+               char buf[16384];
+               while(1)
+               {
+                       unsigned len = in->read(buf, sizeof(buf));
+                       out->write(buf, len);
+                       if(len<sizeof(buf))
+                               break;
+               }
+               delete in;
+               delete out;
+       }
+}
+
 IO::Base *DataTool::open_output(const string &fn)
 {
        if(fn=="-")