QPDFJob: remove from json a few things that only make sense from CLI

Jay Berkenbilt
1 parent eeffc69d
Showing 4 changed files with 6 additions and 12 deletions
job.sums
job.yml
libqpdf/qpdf/auto_job_json_init.hh
libqpdf/qpdf/auto_job_schema.hh
@@ -6,12 +6,12 @@ include/qpdf/auto_job_c_enc.hh 72e138c7b96ed5aacdce78c1dec04b1c20d361faec4f8faf5
 include/qpdf/auto_job_c_main.hh 516adb23cc7e44e614e436880be870d0574e4ebbc706cd855a1360000eed31bb
 include/qpdf/auto_job_c_pages.hh 931840b329a36ca0e41401190e04537b47f2867671a6643bfd8da74014202671
 include/qpdf/auto_job_c_uo.hh 0585b7de459fa479d9e51a45fa92de0ff6dee748efc9ec1cedd0dde6cee1ad50
-job.yml 6389b89c25f0f07fa54bfc3d9f24f814aac5566ace43666f81476781db616ea1
+job.yml 14622557f5c96f379645f01c3d21b3d03bb8fd9c6062a3af429430d5348f5538
 libqpdf/qpdf/auto_job_decl.hh 9f79396ec459f191be4c5fe34cf88c265cf47355a1a945fa39169d1c94cf04f6
 libqpdf/qpdf/auto_job_help.hh 23c79f1d2c02bda28f64aace17f69487205c797e7ae2234892cbbabab49d6d47
 libqpdf/qpdf/auto_job_init.hh 8e9e31b6099a662497339b27f6e2d7f779f35011e88a834bee8811c33405a0fe
 libqpdf/qpdf/auto_job_json_decl.hh f349b55cf85d07a28aeb4bef257bdbcbe16f76b8065d01154161897b1e0fa643
-libqpdf/qpdf/auto_job_json_init.hh 9ea198c4daa6badb30690e2814f3d6ab761c09973a0712341081dabcb2097006
-libqpdf/qpdf/auto_job_schema.hh 9e19fb0b8ddd6fe13da12f1f98c27f6d558fc4706a56a63697e529b3140a457c
+libqpdf/qpdf/auto_job_json_init.hh 60d08982781bd568ab6083d325441f99a6bc39f72492558b8a64757373b2cfbe
+libqpdf/qpdf/auto_job_schema.hh a483911bb1fda9cca53f3021bcdf26998604eabb23f131c78055c52d33ff5a4f
 manual/_ext/qpdf.py e9ac9d6c70642a3d29281ee5ad92ae2422dee8be9306fb8a0bc9dba0ed5e28f3
 manual/cli.rst 79140e023faa0cb77afe0b1dc512dd120ee5617f4db82f842596e4f239f93882
@@ -244,6 +244,9 @@ no-json:
   - job-json-file
   - empty
   - replace-input
+  - warning-exit-0
+  - requires-password
+  - is-encrypted
 json:
   # The structure of this section defines what the json input to
   # QPDFJob looks like. If a key starts with underscore or has a value
@@ -322,9 +325,7 @@ json:
     check:
     check-linearization:
     filtered-stream-data:
-    is-encrypted:
     raw-stream-data:
-    requires-password:
     show-encryption:
     show-encryption-key:
     show-linearization:
@@ -347,7 +348,6 @@ json:
     keep-files-open-threshold:
     no-warn:
     verbose:
-    warning-exit-0:
     ignore-xref-streams:
     password-is-hex-key:
     password-mode:
@@ -87,9 +87,7 @@ beginDict(&quot;inspect&quot;, bindJSON(&amp;Handlers::beginInspect), bindBare(&amp;Handlers::endI
 addBare("check", [this]() { c_main->check(); });
 addBare("checkLinearization", [this]() { c_main->checkLinearization(); });
 addBare("filteredStreamData", [this]() { c_main->filteredStreamData(); });
-addBare("isEncrypted", [this]() { c_main->isEncrypted(); });
 addBare("rawStreamData", [this]() { c_main->rawStreamData(); });
-addBare("requiresPassword", [this]() { c_main->requiresPassword(); });
 addBare("showEncryption", [this]() { c_main->showEncryption(); });
 addBare("showEncryptionKey", [this]() { c_main->showEncryptionKey(); });
 addBare("showLinearization", [this]() { c_main->showLinearization(); });
@@ -111,7 +109,6 @@ addChoices(&quot;keepFilesOpen&quot;, yn_choices, [this](char const* p) { c_main-&gt;keepFile
 addParameter("keepFilesOpenThreshold", [this](char const* p) { c_main->keepFilesOpenThreshold(p); });
 addBare("noWarn", [this]() { c_main->noWarn(); });
 addBare("verbose", [this]() { c_main->verbose(); });
-addBare("warningExit0", [this]() { c_main->warningExit0(); });
 addBare("ignoreXrefStreams", [this]() { c_main->ignoreXrefStreams(); });
 addBare("passwordIsHexKey", [this]() { c_main->passwordIsHexKey(); });
 addChoices("passwordMode", password_mode_choices, [this](char const* p) { c_main->passwordMode(p); });
@@ -72,9 +72,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R&quot;({
     "check": "partially check whether PDF is valid",
     "checkLinearization": "check linearization tables",
     "filteredStreamData": "show filtered stream data",
-    "isEncrypted": "silently test whether a file is encrypted",
     "rawStreamData": "show raw stream data",
-    "requiresPassword": "silently test a file's password",
     "showEncryption": "information about encrypted files",
     "showEncryptionKey": "show key with showEncryption",
     "showLinearization": "show linearization hint tables",
@@ -100,7 +98,6 @@ static constexpr char const* JOB_SCHEMA_DATA = R&quot;({
     "keepFilesOpenThreshold": "set threshold for keepFilesOpen",
     "noWarn": "suppress printing of warning messages",
     "verbose": "print additional information",
-    "warningExit0": "exit 0 even with warnings",
     "ignoreXrefStreams": "use xref tables rather than streams",
     "passwordIsHexKey": "provide hex-encoded encryption key",
     "passwordMode": "tweak how qpdf encodes passwords",