Fix --json-help to take a version parameter

8 files changed, 49 insertions, 15 deletions

diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh
index 1d8b07f6..f2696327 100644
--- a/include/qpdf/QPDFJob.hh
+++ b/include/qpdf/QPDFJob.hh
@@ -46,6 +46,8 @@ class QPDFLogger;
 class QPDFJob
 {
   public:
+    static int constexpr LATEST_JOB_JSON = 1;
+
     // Exit codes -- returned by getExitCode() after calling run()
     static int constexpr EXIT_ERROR = qpdf_exit_error;
     static int constexpr EXIT_WARNING = qpdf_exit_warning;
@@ -426,14 +428,23 @@ class QPDFJob
     doIfVerbose(std::function<void(Pipeline&, std::string const& prefix)> fn);
 
     // Provide a string that is the help information ("schema" for the
-    // qpdf-specific JSON object) for version 1 of the JSON output.
+    // qpdf-specific JSON object) for the specified version of JSON
+    // output.
+    QPDF_DLL
+    static std::string json_out_schema(int version);
+
+    QPDF_DLL
+    [[deprecated("use json_out_schema(version)")]] static std::string
+    json_out_schema_v1();
+
+    // Provide a string that is the help information for specified
+    // version of JSON format for QPDFJob.
     QPDF_DLL
-    static std::string json_out_schema_v1();
+    static std::string job_json_schema(int version);
 
-    // Provide a string that is the help information for the version 1
-    // of JSON format for QPDFJob.
     QPDF_DLL
-    static std::string job_json_schema_v1();
+    [[deprecated("use job_json_schema(version)")]] static std::string
+    job_json_schema_v1();
 
   private:
     struct RotationSpec
diff --git a/job.sums b/job.sums
index e6a9b6b7..fb7d62a9 100644
--- a/job.sums
+++ b/job.sums
@@ -6,10 +6,10 @@ include/qpdf/auto_job_c_enc.hh 28446f3c32153a52afa239ea40503e6cc8ac2c026813526a3
 include/qpdf/auto_job_c_main.hh cdba1ae6ea5525a585d10a3dd95b7996d62b17de4211fe658b78d9d463b0f313
 include/qpdf/auto_job_c_pages.hh b3cc0f21029f6d89efa043dcdbfa183cb59325b6506001c18911614fe8e568ec
 include/qpdf/auto_job_c_uo.hh ae21b69a1efa9333050f4833d465f6daff87e5b38e5106e49bbef5d4132e4ed1
-job.yml ad7c086267fe6f309bf0838840f22cbd95326259cad148b4d5e6699b49f5f379
-libqpdf/qpdf/auto_job_decl.hh 74df4d7fdbdf51ecd0d58ce1e9844bb5525b9adac5a45f7c9a787ecdda2868df
+job.yml f9564f18b08a45d17328af43652645771d3498471820c858b8c9013a193e1412
+libqpdf/qpdf/auto_job_decl.hh 7844eba58edffb9494b19e8eca6fd59a24d6e152ca606c3b07da569f753df2da
 libqpdf/qpdf/auto_job_help.hh db2e4350c700e064b204e3e20d4fee4eddfe312b28092afcf608b4b6863d30e5
-libqpdf/qpdf/auto_job_init.hh 3c3576b6d1d79fda64ae53f08fd9fd2b42c86f3c1d52dd4db0d7f2d4d64b9b4a
+libqpdf/qpdf/auto_job_init.hh fd1635a5ad6ba16b7ae008467145560a59a5ecfd10d29c5ef7cd0d8347747cd2
 libqpdf/qpdf/auto_job_json_decl.hh 06caa46eaf71db8a50c046f91866baa8087745a9474319fb7c86d92634cc8297
 libqpdf/qpdf/auto_job_json_init.hh 59545578a2e47c660ff98516ed53f06638be75eb4658e2a09d32cc08e0cb7268
 libqpdf/qpdf/auto_job_schema.hh 9d543cd4a43eafffc2c4b8a6fee29e399c271c52cb6f7d417ae5497b3c1127dc
diff --git a/job.yml b/job.yml
index 57dd2c48..b411a9b0 100644
--- a/job.yml
+++ b/job.yml
@@ -75,9 +75,10 @@ options:
     bare:
       - version
       - copyright
-      - json-help
       - show-crypto
       - job-json-help
+    optional_choices:
+      json-help: json_version
   - table: main
     config: c_main
     manual:
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index e5914ddd..bc8f64f3 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -487,6 +487,15 @@ QPDFJob::config()
 std::string
 QPDFJob::job_json_schema_v1()
 {
+    return job_json_schema(1);
+}
+
+std::string
+QPDFJob::job_json_schema(int version)
+{
+    if (version != LATEST_JOB_JSON) {
+        throw std::runtime_error("job_json_schema: version must be 1");
+    }
     return JOB_SCHEMA_DATA;
 }
 
@@ -1753,6 +1762,12 @@ QPDFJob::json_schema(int json_version, std::set<std::string>* keys)
 }
 
 std::string
+QPDFJob::json_out_schema(int version)
+{
+    return json_schema(version).unparse();
+}
+
+std::string
 QPDFJob::json_out_schema_v1()
 {
     return json_schema(1).unparse();
diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc
index aa4755e8..89d6b106 100644
--- a/libqpdf/QPDFJob_argv.cc
+++ b/libqpdf/QPDFJob_argv.cc
@@ -143,10 +143,17 @@ ArgParser::argCopyright()
 }
 
 void
-ArgParser::argJsonHelp()
+ArgParser::argJsonHelp(std::string const& parameter)
 {
+    int version = JSON::LATEST;
+    if (!(parameter.empty() || (parameter == "latest"))) {
+        version = QUtil::string_to_int(parameter.c_str());
+    }
+    if ((version < 1) || (version > JSON::LATEST)) {
+        usage(std::string("unsupported json version ") + parameter);
+    }
     *QPDFLogger::defaultLogger()->getInfo()
-        << QPDFJob::json_out_schema_v1() << "\n";
+        << QPDFJob::json_out_schema(version) << "\n";
 }
 
 void
@@ -396,7 +403,7 @@ void
 ArgParser::argJobJsonHelp()
 {
     *QPDFLogger::defaultLogger()->getInfo()
-        << QPDFJob::job_json_schema_v1() << "\n";
+        << QPDFJob::job_json_schema(QPDFJob::LATEST_JOB_JSON) << "\n";
 }
 
 void
diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc
index fcdeb666..fe81bced 100644
--- a/libqpdf/QPDFJob_json.cc
+++ b/libqpdf/QPDFJob_json.cc
@@ -10,7 +10,7 @@
 #include <sstream>
 #include <stdexcept>
 
-static JSON JOB_SCHEMA = JSON::parse(QPDFJob::job_json_schema_v1().c_str());
+static JSON JOB_SCHEMA = JSON::parse(QPDFJob::job_json_schema(1).c_str());
 
 namespace
 {
diff --git a/libqpdf/qpdf/auto_job_decl.hh b/libqpdf/qpdf/auto_job_decl.hh
index 02f0ca91..196a4fe7 100644
--- a/libqpdf/qpdf/auto_job_decl.hh
+++ b/libqpdf/qpdf/auto_job_decl.hh
@@ -16,9 +16,9 @@ static constexpr char const* O_COPY_ATTACHMENT = "copy attachment";
 
 void argVersion();
 void argCopyright();
-void argJsonHelp();
 void argShowCrypto();
 void argJobJsonHelp();
+void argJsonHelp(std::string const&);
 void argPositional(std::string const&);
 void argAddAttachment();
 void argCopyAttachmentsFrom();
diff --git a/libqpdf/qpdf/auto_job_init.hh b/libqpdf/qpdf/auto_job_init.hh
index 0c5302e1..b90592e0 100644
--- a/libqpdf/qpdf/auto_job_init.hh
+++ b/libqpdf/qpdf/auto_job_init.hh
@@ -29,9 +29,9 @@ static char const* modify128_choices[] = {"all", "annotate", "form", "assembly",
 this->ap.selectHelpOptionTable();
 this->ap.addBare("version", b(&ArgParser::argVersion));
 this->ap.addBare("copyright", b(&ArgParser::argCopyright));
-this->ap.addBare("json-help", b(&ArgParser::argJsonHelp));
 this->ap.addBare("show-crypto", b(&ArgParser::argShowCrypto));
 this->ap.addBare("job-json-help", b(&ArgParser::argJobJsonHelp));
+this->ap.addChoices("json-help", p(&ArgParser::argJsonHelp), false, json_version_choices);
 this->ap.selectMainOptionTable();
 this->ap.addPositional(p(&ArgParser::argPositional));
 this->ap.addBare("add-attachment", b(&ArgParser::argAddAttachment));