Merge pull request #25 from baughmann/feat/tika-4

feat: upgrade bundled Apache Tika 3.2.3 → 3.3.1

Author: baughmann

Makefile

@@ -1,6 +1,6 @@
 UV := uv run
 # Also update TIKA_VERSION in src/tikara/util/java.py to match
-TIKA_VERSION := 3.2.3
+TIKA_VERSION := 3.3.1
 TIKA_JAR := src/tikara/jars/tika-app-$(TIKA_VERSION).jar
 
 .DEFAULT_GOAL := help

SUPPORTED_MIME_TYPES.md

@@ -1306,6 +1306,7 @@
 - `image/aces`
 - `image/avif`
 - `image/bmp`
+- `image/bmp; format=compressed`
 - `image/cgm`
 - `image/emf`
 - `image/example`
@@ -1481,6 +1482,7 @@
 - `text/html`
 - `text/iso19139+xml`
 - `text/javascript`
+- `text/markdown`
 - `text/parityfec`
 - `text/plain`
 - `text/prs.fallenstein.rst`
@@ -1597,7 +1599,6 @@
 - `text/x-vcard`
 - `text/x-verilog`
 - `text/x-vhdl`
-- `text/x-web-markdown`
 - `text/x-yacc`
 - `text/x-yaml`
 - `video/3gpp`

src/tikara/jars/tika-app-3.2.3.jar src/tikara/jars/tika-app-3.3.1.jarsrc/tikara/jars/tika-app-3.2.3.jar renamed to src/tikara/jars/tika-app-3.3.1.jar

@@ -26,7 +26,7 @@
 #
 # JVM utilities
 #
-TIKA_VERSION = "3.2.3"
+TIKA_VERSION = "3.3.1"
 
 
 def get_jars() -> list[Path]:

src/tikara/util/java.py

@@ -10,9 +10,31 @@
 from tikara.data_types import TikaUnpackResult
 from tikara.error_handling import TikaError
 
+# Each level of test_recursive_embedded.docx nests a further zip, so raising max_depth
+# must strictly widen the result. Tika <= 3.2.3 stopped after the first child of
+# embed1.zip and returned the same three files for every depth >= 2; the depth-3 case
+# below is what pins the recursion down.
 UNPACK_RECURSIVE_TEST_CASES: list[tuple[str, list[str], int]] = [
     ("test_recursive_embedded_docx", ["embed1.zip", "image1.emf"], 1),
-    ("test_recursive_embedded_docx", ["embed1.zip", "image1.emf", "embed1/embed1a.txt"], 2),
+    (
+        "test_recursive_embedded_docx",
+        ["embed1.zip", "image1.emf", "embed1/embed1a.txt", "embed1/embed1b.txt", "embed1/embed2.zip"],
+        2,
+    ),
+    (
+        "test_recursive_embedded_docx",
+        [
+            "embed1.zip",
+            "image1.emf",
+            "embed1/embed1a.txt",
+            "embed1/embed1b.txt",
+            "embed1/embed2.zip",
+            "embed2/embed2a.txt",
+            "embed2/embed2b.txt",
+            "embed2/embed3.zip",
+        ],
+        3,
+    ),
     ("demo_docx", ["image2.png", "image3.png", "image4.png"], 1),
     ("demo_docx", ["image2.png", "image3.png", "image4.png"], 2),
     ("basic_txt", [], 1),