From 9013b7ca919c13b03488056dff55ffbf5215f008 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Wed, 26 Jan 2022 16:48:18 -0500 Subject: [PATCH] QPDFJob: move placeholder json to a separate source file --- include/qpdf/QPDFJob.hh | 6 ++- libqpdf/QPDFJob.cc | 8 ++++ libqpdf/QPDFJob_argv.cc | 97 +--------------------------------------- libqpdf/QPDFJob_json.cc | 99 +++++++++++++++++++++++++++++++++++++++++ libqpdf/build.mk | 1 + 5 files changed, 114 insertions(+), 97 deletions(-) create mode 100644 libqpdf/QPDFJob_json.cc diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index 12c7bfb7..274a19f6 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -80,7 +80,6 @@ class QPDFJob void initializeFromArgv(int argc, char* argv[], char const* progname_env = nullptr); - // QXXXQ QPDF_DLL void initializeFromJson(std::string const& json); @@ -323,6 +322,11 @@ class QPDFJob QPDF_DLL static std::string json_out_schema_v1(); + // Provide a string that is the help information for the version 1 + // of JSON format for QPDFJob. + QPDF_DLL + static std::string json_job_schema_v1(); + private: struct RotationSpec { diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index d1706185..b0143449 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -33,6 +33,8 @@ #include #include +#include // JOB_SCHEMA_DATA + QPDFJob::ConfigError::ConfigError(std::string const& msg) : std::runtime_error(msg) { @@ -478,6 +480,12 @@ QPDFJob::config() return std::shared_ptr(new Config(*this)); } +std::string +QPDFJob::json_job_schema_v1() +{ + return JOB_SCHEMA_DATA; +} + void QPDFJob::parseRotationParameter(std::string const& parameter) { diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index cca3abca..f4c15e31 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -16,10 +16,6 @@ #include #include #include -#include - -#include -static JSON JOB_SCHEMA = JSON::parse(JOB_SCHEMA_DATA); namespace { @@ -468,7 +464,7 @@ ArgParser::argEndCopyAttachment() void ArgParser::argJobJsonHelp() { - std::cout << JOB_SCHEMA_DATA << std::endl; + std::cout << QPDFJob::json_job_schema_v1() << std::endl; } void @@ -504,94 +500,3 @@ QPDFJob::initializeFromArgv(int argc, char* argv[], char const* progname_env) QPDFArgParser::bindBare(&QPDFJob::checkConfiguration, this)); ap.parseOptions(); } - -void -QPDFJob::initializeFromJson(std::string const& json) -{ - std::list errors; - JSON j = JSON::parse(json); - if (! j.checkSchema(JOB_SCHEMA, JSON::f_optional, errors)) - { - std::ostringstream msg; - msg << this->m->message_prefix - << ": job json has errors:"; - for (auto const& error: errors) - { - msg << std::endl << " " << error; - } - throw std::runtime_error(msg.str()); - } - - JSONHandler jh; - { - jh.addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - - auto input = std::make_shared(); - auto input_file = std::make_shared(); - auto input_file_name = std::make_shared(); - auto output = std::make_shared(); - auto output_file = std::make_shared(); - auto output_file_name = std::make_shared(); - auto output_options = std::make_shared(); - auto output_options_qdf = std::make_shared(); - - input->addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - input_file->addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - output->addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - output_file->addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - output_options->addDictHandlers( - [](std::string const&){}, - [](std::string const&){}); - - jh.addDictKeyHandler("input", input); - input->addDictKeyHandler("file", input_file); - input_file->addDictKeyHandler("name", input_file_name); - jh.addDictKeyHandler("output", output); - output->addDictKeyHandler("file", output_file); - output_file->addDictKeyHandler("name", output_file_name); - output->addDictKeyHandler("options", output_options); - output_options->addDictKeyHandler("qdf", output_options_qdf); - - input_file_name->addStringHandler( - [this](std::string const&, std::string const& v) { - config()->inputFile(v.c_str()); - }); - output_file_name->addStringHandler( - [this](std::string const&, std::string const& v) { - config()->outputFile(v.c_str()); - }); - output_options_qdf->addBoolHandler( - [this](std::string const&, bool v) { - // QXXXQ require v to be true - config()->qdf(); - }); - } - - // { - // "input": { - // "file": { - // "name": "/home/ejb/source/examples/pdf/minimal.pdf" - // } - // }, - // "output": { - // "file": { - // "name": "/tmp/a.pdf" - // }, - // "options": { - // "qdf": true - // } - // } - // } - - jh.handle(".", j); -} diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc new file mode 100644 index 00000000..74fd27bd --- /dev/null +++ b/libqpdf/QPDFJob_json.cc @@ -0,0 +1,99 @@ +#include +#include + +#include +#include +#include + +static JSON JOB_SCHEMA = JSON::parse(QPDFJob::json_job_schema_v1().c_str()); + +void +QPDFJob::initializeFromJson(std::string const& json) +{ + std::list errors; + JSON j = JSON::parse(json); + if (! j.checkSchema(JOB_SCHEMA, JSON::f_optional, errors)) + { + std::ostringstream msg; + msg << this->m->message_prefix + << ": job json has errors:"; + for (auto const& error: errors) + { + msg << std::endl << " " << error; + } + throw std::runtime_error(msg.str()); + } + + JSONHandler jh; + { + jh.addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + + auto input = std::make_shared(); + auto input_file = std::make_shared(); + auto input_file_name = std::make_shared(); + auto output = std::make_shared(); + auto output_file = std::make_shared(); + auto output_file_name = std::make_shared(); + auto output_options = std::make_shared(); + auto output_options_qdf = std::make_shared(); + + input->addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + input_file->addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + output->addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + output_file->addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + output_options->addDictHandlers( + [](std::string const&){}, + [](std::string const&){}); + + jh.addDictKeyHandler("input", input); + input->addDictKeyHandler("file", input_file); + input_file->addDictKeyHandler("name", input_file_name); + jh.addDictKeyHandler("output", output); + output->addDictKeyHandler("file", output_file); + output_file->addDictKeyHandler("name", output_file_name); + output->addDictKeyHandler("options", output_options); + output_options->addDictKeyHandler("qdf", output_options_qdf); + + input_file_name->addStringHandler( + [this](std::string const&, std::string const& v) { + config()->inputFile(v.c_str()); + }); + output_file_name->addStringHandler( + [this](std::string const&, std::string const& v) { + config()->outputFile(v.c_str()); + }); + output_options_qdf->addBoolHandler( + [this](std::string const&, bool v) { + // QXXXQ require v to be true + config()->qdf(); + }); + } + + // { + // "input": { + // "file": { + // "name": "/home/ejb/source/examples/pdf/minimal.pdf" + // } + // }, + // "output": { + // "file": { + // "name": "/tmp/a.pdf" + // }, + // "options": { + // "qdf": true + // } + // } + // } + + jh.handle(".", j); +} diff --git a/libqpdf/build.mk b/libqpdf/build.mk index 4cb546d8..8cedb44a 100644 --- a/libqpdf/build.mk +++ b/libqpdf/build.mk @@ -74,6 +74,7 @@ SRCS_libqpdf = \ libqpdf/QPDFJob.cc \ libqpdf/QPDFJob_argv.cc \ libqpdf/QPDFJob_config.cc \ + libqpdf/QPDFJob_json.cc \ libqpdf/QPDFMatrix.cc \ libqpdf/QPDFNameTreeObjectHelper.cc \ libqpdf/QPDFNumberTreeObjectHelper.cc \