git.iko.soy/typeable/pandoc
on master help sign in
ODT reader: give more information if zip can't be unpacked.
5cd1c10John MacFarlane
src/Text/Pandoc/Readers/Odt.hs+4−1
compare with master
unifiedsplit
@@ -23,6 +23,8 @@ import System.FilePath
23
23
24import Control.Monad.Except (throwError)
24import Control.Monad.Except (throwError)
25
25
26+import qualified Data.Text as T
27+
26import Text.Pandoc.Class.PandocMonad (PandocMonad)
28import Text.Pandoc.Class.PandocMonad (PandocMonad)
27import qualified Text.Pandoc.Class.PandocMonad as P
29import qualified Text.Pandoc.Class.PandocMonad as P
28import Text.Pandoc.Definition
30import Text.Pandoc.Definition
@@ -60,7 +62,8 @@ readOdt' _ bytes = bytesToOdt bytes-- of
60bytesToOdt :: B.ByteString -> Either PandocError (Pandoc, MediaBag)
62bytesToOdt :: B.ByteString -> Either PandocError (Pandoc, MediaBag)
61bytesToOdt bytes = case toArchiveOrFail bytes of
63bytesToOdt bytes = case toArchiveOrFail bytes of
62 Right archive -> archiveToOdt archive
64 Right archive -> archiveToOdt archive
63− Left _ -> Left $ PandocParseError "Couldn't parse odt file."
65+ Left err -> Left $ PandocParseError
66+ $ "Could not unzip ODT: " <> T.pack err
64
67
65--
68--
66archiveToOdt :: Archive -> Either PandocError (Pandoc, MediaBag)
69archiveToOdt :: Archive -> Either PandocError (Pandoc, MediaBag)