From 4e4f2f8c2b2c043077390cb4ccf7ce97ffe4ac6b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 Oct 2026 20:24:11 -0400 Subject: format 2.1: ocda-read, the readers folded in ocda-read, one reader where there were two. The .ssp reader and the .ocda.db reader each had their own parser; this one is built on the library, so every mode reads a .ssp, a .ocda.db and a pod, and says the same thing of each. Its output modules are the .ssp reader's, copied (the reader repositories are kept, frozen) and moved onto the library's model; --languages and --files come from the database reader. ocda-read [--tree|--html|--llm-text|--llm-jsonl|--images| --verify --image-dir=|--languages|--files| --report-unknown|--validate] [lang] In D every mode of both readers; in Gleam the modes the Gleam readers had (the summary, --tree, --languages, --files, --report-unknown), whose output is the D reader's, byte for byte. In each language it lives in src/read/ and is not part of the library: dub configurations keep it out of a dependant's build in D, and Gleam compiles all of src/ but a dependant need not use it. Checked over the markup document samples: against the .ssp reader on a .ssp, byte for byte after the first line in every D mode but the summary, whose closing hint differs; against the database reader on a .ocda.db, --files and --languages (its id column left out); the same output from the .ssp, the .ocda.db and the .sisupod; and D == Gleam. The database reader's --outline is not reproduced: it ordered headings within their own section, so that other sections' headings fell among the body's. --outline here is --tree. What writing it found in the library: the database loader could not say what it had not understood. It asked for columns by name and so never saw the rest, and reported that it had understood everything. It now counts them on the conditions under which the .ssp writes the same property, and --report-unknown is the same from every form. ocda.inventory answers two questions about the file rather than the document: its languages, in the manifest's order, each with the markup it was made from and the sha256 of its .ssp, for every form alike; and what a .ocda.db carries besides the abstraction. In Gleam the sha256 comes from OTP's crypto through a four line Erlang FFI. The flake's default is all three D programs in one result: built separately into the same link, each replaced the one before. (assisted by Claude-Code) --- dlang/src/read/images.d | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 dlang/src/read/images.d (limited to 'dlang/src/read/images.d') diff --git a/dlang/src/read/images.d b/dlang/src/read/images.d new file mode 100644 index 0000000..afddc74 --- /dev/null +++ b/dlang/src/read/images.d @@ -0,0 +1,114 @@ +module read.images; + +import std.array : join; +import std.conv : to; +import std.stdio : writeln, File; +import ocda.model; + +/+ ↓ the .image records of a document, gathered per distinct file, with the + objects referencing each file, in order of first appearance +/ +struct ImageEntry { + string name; + string sha256; + ulong bytes; + int width; + int height; + bool missing; + string[] refs; + string[] other_sha256; // same filename, differing digest +} + +struct ImageRecords { + int records; // .image lines, an image referenced twice counts twice + ImageEntry[] entries; // distinct files +} + +ImageRecords gatherImageRecords(OcdaDocument doc) { + ImageRecords ret; + size_t[string] seen; + foreach (section; sectionNames) { + auto objs = doc.sectionByName(section); + if (objs is null) continue; + foreach (obj; *objs) { + foreach (img; obj.images) { + ret.records += 1; + string _ref = section ~ "[" ~ obj.ocn.to!string ~ "]"; + if (auto at = img.name in seen) { + if (ret.entries[*at].sha256 != img.sha256 + && img.sha256.length > 0 + && ret.entries[*at].sha256.length > 0) { + ret.entries[*at].other_sha256 ~= img.sha256; + } + ret.entries[*at].refs ~= _ref; + } else { + ImageEntry e_; + e_.name = img.name; + e_.sha256 = img.sha256; + e_.bytes = img.bytes; + e_.width = img.width; + e_.height = img.height; + e_.missing = img.missing; + e_.refs = [_ref]; + seen[img.name] = ret.entries.length; + ret.entries ~= e_; + } + } + } + } + return ret; +} + +/+ ↓ image manifest, line oriented and greppable: + + refs: body[97] body[412] + MISSING refs: body[840] + + The point of the record in the .ssp is verification (is the image + shipped in this pod the image the abstraction was built from), so this + output is the shape a verifier wants: one line per distinct file. ++/ +void outputImages(OcdaDocument doc, string output_file) { + auto gathered = gatherImageRecords(doc); + string[] lines; + int missing = 0; + foreach (e; gathered.entries) { + if (e.missing) missing += 1; + } + lines ~= "Images: " ~ gathered.records.to!string ~ " record" + ~ ((gathered.records == 1) ? "" : "s") + ~ ", " ~ gathered.entries.length.to!string ~ " distinct file" + ~ ((gathered.entries.length == 1) ? "" : "s") + ~ ", " ~ missing.to!string ~ " missing"; + lines ~= ""; + foreach (e; gathered.entries) { + string px = (e.width > 0 && e.height > 0) + ? e.width.to!string ~ "x" ~ e.height.to!string : "-"; + lines ~= (e.missing) + ? "MISSING" ~ " " ~ e.name ~ " refs: " ~ e.refs.join(" ") + : e.sha256 ~ " " ~ e.bytes.to!string ~ " " ~ px + ~ " " ~ e.name ~ " refs: " ~ e.refs.join(" "); + /+ ↓ one filename, more than one digest: the .ssp is inconsistent, + or two distinct files share a name +/ + foreach (other; e.other_sha256) { + lines ~= " WARNING differing digest for same filename: " ~ other; + } + } + + /+ ↓ write output +/ + if (output_file.length > 0) { + auto f = File(output_file, "w"); + foreach (line; lines) f.writeln(line); + } else { + foreach (line; lines) writeln(line); + } +} + +/+ ↓ count of .image records in a document, for the parse summary +/ +int imageRecordCount(OcdaDocument doc) { + return gatherImageRecords(doc).records; +} + +package immutable string[] sectionNames = [ + "head", "toc", "body", "endnotes", + "glossary", "bibliography", "bookindex", "blurb", +]; -- cgit v1.2.3