Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Docx Reader: Throw PandocError on unzip failure

Browse source 
Previously, readDocx would error out if zip-archive failed. We change
the archive extraction step from `toArchive` to `toArchiveOrFail`, which
returns an Either value.
This commit is contained in:
Jesse Rosenthal 2016-05-01 12:17:12 -04:00
parent aa4a1d527a
commit 91dc334249
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Text/Pandoc/Readers/Docx.hs
View file

@ -100,12 +100,13 @@ import Text.Pandoc.Compat.Except
readDocxWithWarnings :: ReaderOptions readDocxWithWarnings :: ReaderOptions
-> B.ByteString -> B.ByteString
-> Either PandocError (Pandoc, MediaBag, [String]) -> Either PandocError (Pandoc, MediaBag, [String])
readDocxWithWarnings opts bytes = readDocxWithWarnings opts bytes
case archiveToDocxWithWarnings (toArchive bytes) of | Right archive <- toArchiveOrFail bytes
Right (docx, warnings) -> do , Right (docx, warnings) <- archiveToDocxWithWarnings archive = do
(meta, blks, mediaBag) <- docxToOutput opts docx (meta, blks, mediaBag) <- docxToOutput opts docx
return (Pandoc meta blks, mediaBag, warnings) return (Pandoc meta blks, mediaBag, warnings)
Left _ -> Left (ParseFailure "couldn't parse docx file") readDocxWithWarnings _ _ =
Left (ParseFailure "couldn't parse docx file")
readDocx :: ReaderOptions readDocx :: ReaderOptions
-> B.ByteString -> B.ByteString