OpenSystemsDevelopment / qpdf

Commit 1a3ed1ee8569504bc57bdba07cc4e8b87442767d

Authored by Jay Berkenbilt
1 parent 81b6314c

job json: move deterministic-id into output options

Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
job.sums
  View file @1a3ed1e
... ... @@ -6,12 +6,12 @@ include/qpdf/auto_job_c_enc.hh 72e138c7b96ed5aacdce78c1dec04b1c20d361faec4f8faf5
6 6 include/qpdf/auto_job_c_main.hh 516adb23cc7e44e614e436880be870d0574e4ebbc706cd855a1360000eed31bb
7 7 include/qpdf/auto_job_c_pages.hh 931840b329a36ca0e41401190e04537b47f2867671a6643bfd8da74014202671
8 8 include/qpdf/auto_job_c_uo.hh 0585b7de459fa479d9e51a45fa92de0ff6dee748efc9ec1cedd0dde6cee1ad50
9   -job.yml 14622557f5c96f379645f01c3d21b3d03bb8fd9c6062a3af429430d5348f5538
  9 +job.yml 2ccc58ef74b875524505d7f00561b2df27ec2000846a549ac21a1fdd2f74c096
10 10 libqpdf/qpdf/auto_job_decl.hh 9f79396ec459f191be4c5fe34cf88c265cf47355a1a945fa39169d1c94cf04f6
11 11 libqpdf/qpdf/auto_job_help.hh 23c79f1d2c02bda28f64aace17f69487205c797e7ae2234892cbbabab49d6d47
12 12 libqpdf/qpdf/auto_job_init.hh 8e9e31b6099a662497339b27f6e2d7f779f35011e88a834bee8811c33405a0fe
13 13 libqpdf/qpdf/auto_job_json_decl.hh 4846055075dcb7365c56c02150e955979b522d14f4329ce7a8a302ccd1d7aa2a
14   -libqpdf/qpdf/auto_job_json_init.hh a8053ffcd4cc8c533a269805c79bba6757e5d17800f0d18938adf16e896694a3
15   -libqpdf/qpdf/auto_job_schema.hh 3cd89b775118e09aa99fed200ca36c8a8dec8d17bc039012ca210b6a33ce1d8a
  14 +libqpdf/qpdf/auto_job_json_init.hh 8ccfcfe06339c69631da2167cd1a77844a3cc9031e4090998113ef70b96bcb70
  15 +libqpdf/qpdf/auto_job_schema.hh 27cadf4f0c99dd27c569ec6d870a51d2abb51c8daaad94a55c42b6e86cf7726a
16 16 manual/_ext/qpdf.py e9ac9d6c70642a3d29281ee5ad92ae2422dee8be9306fb8a0bc9dba0ed5e28f3
17 17 manual/cli.rst 79140e023faa0cb77afe0b1dc512dd120ee5617f4db82f842596e4f239f93882
... ...
... ... @@ -277,6 +277,7 @@ json:
277 277 recompress-flate:
278 278 decode-level:
279 279 decrypt:
  280 + deterministic-id:
280 281 static-aes-iv:
281 282 static-id:
282 283 no-original-object-ids:
... ... @@ -343,7 +344,6 @@ json:
343 344 - null
344 345 _options:
345 346 allow-weak-crypto:
346   - deterministic-id:
347 347 keep-files-open:
348 348 keep-files-open-threshold:
349 349 no-warn:
... ...
libqpdf/qpdf/auto_job_json_init.hh
  View file @1a3ed1e
... ... @@ -66,6 +66,9 @@ popHandler(); // key: decodeLevel
66 66 pushKey("decrypt");
67 67 addBare([this]() { c_main->decrypt(); });
68 68 popHandler(); // key: decrypt
  69 +pushKey("deterministicId");
  70 +addBare([this]() { c_main->deterministicId(); });
  71 +popHandler(); // key: deterministicId
69 72 pushKey("staticAesIv");
70 73 addBare([this]() { c_main->staticAesIv(); });
71 74 popHandler(); // key: staticAesIv
... ... @@ -263,9 +266,6 @@ beginDict(bindJSON(&Handlers::beginOptions), bindBare(&Handlers::endOptions)); /
263 266 pushKey("allowWeakCrypto");
264 267 addBare([this]() { c_main->allowWeakCrypto(); });
265 268 popHandler(); // key: allowWeakCrypto
266   -pushKey("deterministicId");
267   -addBare([this]() { c_main->deterministicId(); });
268   -popHandler(); // key: deterministicId
269 269 pushKey("keepFilesOpen");
270 270 addChoices(yn_choices, [this](char const* p) { c_main->keepFilesOpen(p); });
271 271 popHandler(); // key: keepFilesOpen
... ...
libqpdf/qpdf/auto_job_schema.hh
  View file @1a3ed1e
... ... @@ -18,6 +18,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({
18 18 "recompressFlate": "uncompress and recompress flate",
19 19 "decodeLevel": "control which streams to uncompress",
20 20 "decrypt": "remove encryption from input file",
  21 + "deterministicId": "generate ID deterministically",
21 22 "staticAesIv": "use a fixed AES vector",
22 23 "staticId": "use a fixed document ID",
23 24 "noOriginalObjectIds": "omit original object IDs in qdf",
... ... @@ -93,7 +94,6 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({
93 94 },
94 95 "options": {
95 96 "allowWeakCrypto": "allow insecure cryptographic algorithms",
96   - "deterministicId": "generate ID deterministically",
97 97 "keepFilesOpen": "manage keeping multiple files open",
98 98 "keepFilesOpenThreshold": "set threshold for keepFilesOpen",
99 99 "noWarn": "suppress printing of warning messages",
... ...