diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-02-21 09:05:38 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-02-21 09:05:38 +0000 |
| commit | cfabbcdab4fbd8401569ec5e6e88a6bca913b502 (patch) | |
| tree | 23b21bc4c2f5ad26259ce65aa87f074c5c06361c /src/main/java/org/zwobble/mammoth/docx/DocumentReader.java | |
| parent | f0159a9c51a92adcef38307c4e173a3de51bc373 (diff) | |
Implement FileReader to support external images
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/docx/DocumentReader.java')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/docx/DocumentReader.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java index d55fa9b..8fe0919 100644 --- a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java @@ -7,6 +7,7 @@ import org.zwobble.mammoth.util.MammothLists; import org.zwobble.mammoth.xml.XmlElement; import java.io.IOException; +import java.nio.file.Path; import java.util.Optional; import static org.zwobble.mammoth.util.MammothLists.list; @@ -17,13 +18,11 @@ public class DocumentReader { BodyXmlReader forName(String name); } - public static Result<Document> readDocument(DocxFile zipFile) { + public static Result<Document> readDocument(Optional<Path> path, DocxFile zipFile) { Styles styles = readStyles(zipFile); Numbering numbering = readNumbering(zipFile); ContentTypes contentTypes = readContentTypes(zipFile); - FileReader fileReader = uri -> { - throw new UnsupportedOperationException(); - }; + FileReader fileReader = uri -> path.get().toUri().resolve(uri).toURL().openStream(); BodyReaders bodyReaders = name -> { Relationships relationships = readRelationships(zipFile, name); return new BodyXmlReader(styles, numbering, relationships, contentTypes, zipFile, fileReader); |
