octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

QPDFJob: move placeholder json to a separate source file

This commit is contained in:
Jay Berkenbilt 2022-01-26 16:48:18 -05:00
parent edef2cd330
commit 9013b7ca91
5 changed files with 114 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qpdf/QPDFJob.hh
View File

@ -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
{

8
libqpdf/QPDFJob.cc
View File

@ -33,6 +33,8 @@
#include <qpdf/QPDFWriter.hh>
#include <qpdf/QIntC.hh>
#include <qpdf/auto_job_schema.hh> // JOB_SCHEMA_DATA
QPDFJob::ConfigError::ConfigError(std::string const& msg) :
std::runtime_error(msg)
{
@ -478,6 +480,12 @@ QPDFJob::config()
return std::shared_ptr<Config>(new Config(*this));
}
std::string
QPDFJob::json_job_schema_v1()
{
return JOB_SCHEMA_DATA;
}
void
QPDFJob::parseRotationParameter(std::string const& parameter)
{

97
libqpdf/QPDFJob_argv.cc
View File

@ -16,10 +16,6 @@
#include <qpdf/QPDFArgParser.hh>
#include <qpdf/QPDFJob.hh>
#include <qpdf/QIntC.hh>
#include <qpdf/JSONHandler.hh>
#include <qpdf/auto_job_schema.hh>
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<std::string> 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<JSONHandler>();
auto input_file = std::make_shared<JSONHandler>();
auto input_file_name = std::make_shared<JSONHandler>();
auto output = std::make_shared<JSONHandler>();
auto output_file = std::make_shared<JSONHandler>();
auto output_file_name = std::make_shared<JSONHandler>();
auto output_options = std::make_shared<JSONHandler>();
auto output_options_qdf = std::make_shared<JSONHandler>();
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);
}

99
libqpdf/QPDFJob_json.cc Normal file
View File

@ -0,0 +1,99 @@
#include <qpdf/QPDFJob.hh>
#include <qpdf/JSONHandler.hh>
#include <memory>
#include <stdexcept>
#include <sstream>
static JSON JOB_SCHEMA = JSON::parse(QPDFJob::json_job_schema_v1().c_str());
void
QPDFJob::initializeFromJson(std::string const& json)
{
std::list<std::string> 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<JSONHandler>();
auto input_file = std::make_shared<JSONHandler>();
auto input_file_name = std::make_shared<JSONHandler>();
auto output = std::make_shared<JSONHandler>();
auto output_file = std::make_shared<JSONHandler>();
auto output_file_name = std::make_shared<JSONHandler>();
auto output_options = std::make_shared<JSONHandler>();
auto output_options_qdf = std::make_shared<JSONHandler>();
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);
}

1
libqpdf/build.mk
View File

@ -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 \