| 0fbee189 | 22-Jun-2026 |
Andreas Gohr <gohr@cosmocode.de> |
Return body text and metadata from a single extraction
Every extractor now returns an ExtractionResult (body text plus a normalised metadata map) from one parse of the file, instead of just a text s
Return body text and metadata from a single extraction
Every extractor now returns an ExtractionResult (body text plus a normalised metadata map) from one parse of the file, instead of just a text string. Metadata keys are a single canonical vocabulary shared across all formats - Title, Author, Subject, Keywords, Description, Created, Modified, Language, Producer, plus Copyright (image-only) - so consumers never have to special-case the source format.
- ExtractionResult: final readonly value object carrying $text, $metadata and a per-half ?Throwable $textError / $metadataError (with isComplete()). Text and metadata are extracted independently: an extractor throws only at its total-failure gate (container won't unzip, PDF won't parse, file unreadable) and otherwise records a failed half's error while still returning the salvaged half.
- OOXML/ODF metadata: new AbstractOoxmlExtractor and AbstractOdfExtractor intermediaries declare each family's source map once (docProps/core.xml + app.xml; meta.xml); the concrete extractors only switch their extends clause. AbstractZipXmlExtractor gains a generic mapMetadataFromXml() walker.
- PDF: reads the Info dictionary (Title/Author/Subject/Keywords/Created/ Modified/Producer-else-Creator) alongside the body text from the same parse. normalizePdfString() is a temporary shim for UTF-16BE literal strings that prinsfrank <= v3.1.0 returns mojibake-expanded.
- Images: now metadata-only (text is ''); field-map keys renamed to the canonical vocabulary (Caption->Description, Date->Created, Camera->Producer).
- helper: extract() and extractMetadata() added; extractText() keeps its string return and its throw-on-failure contract (rethrows textError), so the docsearch plugin keeps working unchanged.
- cli: prints body text followed by metadata by default; --text/-t and --meta/-m restrict to one. A salvaged-but-partial extraction warns on STDERR and exits 0; nothing usable exits non-zero.
- ExtractionException::wrap() centralises wrapping a caught error as an ExtractionException (passing one through if it already is).
Tests assert the real Tika samples' embedded metadata and the partial-failure paths. The pre-existing PDF body-text Form-XObject failure is unchanged.
show more ...
|
| 7ddd936f | 17-Jun-2026 |
Andreas Gohr <gohr@cosmocode.de> |
Drop the PDF parser availability check
smalot/pdfparser is bundled in the committed vendor/ directory, so the parser is always present. The class_exists() guard could never fire and its "run compose
Drop the PDF parser availability check
smalot/pdfparser is bundled in the committed vendor/ directory, so the parser is always present. The class_exists() guard could never fire and its "run composer install" message was misleading for a bundled dependency.
show more ...
|
| c590c200 | 17-Jun-2026 |
Andreas Gohr <gohr@cosmocode.de> |
Open extractors and factory for extension
Remove final from ExtractorFactory and the nine extractors, and widen every private method, property and constant to protected, so the classes can be subcla
Open extractors and factory for extension
Remove final from ExtractorFactory and the nine extractors, and widen every private method, property and constant to protected, so the classes can be subclassed and their helpers reused. The abstract base, the interface and the exception hierarchy were already extensible and are unchanged.
show more ...
|
| 37c5feaa | 17-Jun-2026 |
Andreas Gohr <gohr@cosmocode.de> |
Use DokuWiki's temp dir and clean up in destructor
Allocate the archive-unpack temp dir in DokuWiki's own temp dir ($conf['tmpdir']) via core's io_mktmpdir(), and remove it with io_rmdir(), instead
Use DokuWiki's temp dir and clean up in destructor
Allocate the archive-unpack temp dir in DokuWiki's own temp dir ($conf['tmpdir']) via core's io_mktmpdir(), and remove it with io_rmdir(), instead of the system temp dir. Add a destructor that repeats the cleanup as a safety net so the dir is removed even if the process dies before extract()'s finally block runs. Align the test FixtureBuilder on the same core helpers.
show more ...
|
| e3bf24fb | 17-Jun-2026 |
Andreas Gohr <gohr@cosmocode.de> |
Expand test coverage and fix two extractor bugs
Broaden the test suite from happy-path fixtures to the branching logic that was previously unexercised, and fix two real bugs the new coverage exposed
Expand test coverage and fix two extractor bugs
Broaden the test suite from happy-path fixtures to the branching logic that was previously unexercised, and fix two real bugs the new coverage exposed:
- XlsxExtractor: resolve sheet name->file mapping and tab order through xl/workbook.xml + xl/_rels/workbook.xml.rels instead of pairing sorted worksheet filenames with names positionally, which mismatched them whenever tab order differed from file numbering. Falls back to positional/SheetN naming when the workbook or its rels are absent. - ImageExtractor: PHP's exif reader decodes Windows XP tags into a WINXP section under short names (Title/Comment/Author/Keywords/Subject), not as XPTitle etc., so those fields were silently dropped. List the short names first, keep the XP* raw names as a cross-version fallback.
Tests: - FixtureBuilder gains DOCX header/footer, PPTX notes, multi-sheet XLSX (+ no-workbook/no-worksheet variants), rich ODS (repeated columns, covered cells, multi-paragraph cells, MAX_REPEAT cap, unnamed-sheet fallback), a hand-packed TIFF with EXIF incl. a UTF-16LE XPTitle, and a public zip() helper for composing broken containers. - New critical-path coverage: header/footer, speaker notes, ODS edge cases, XLSX multi-sheet/fallback/no-worksheet guards, EXIF/TIFF incl. XP decode, and per-format missing-part/missing-file error paths. - Routing, reject and supports() tests converted to data providers, plus a drift guard that routes every supportedExtensions() entry through forFile(). - Real-world LibreOffice samples under _test/data covered by SampleFilesTest.
47 -> 155 tests, 104 -> 231 assertions.
show more ...
|