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

fillMediaBag: don't cause fatal error if resource not found.

Browse source 
Report warning instead and change image to its alt text.
This commit is contained in:
John MacFarlane 2017-05-07 12:16:14 +02:00
parent af8860d26a
commit f8e125f42d
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Text/Pandoc/App.hs
View file

@ -39,6 +39,7 @@ module Text.Pandoc.App (
) where ) where
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
import qualified Control.Exception as E import qualified Control.Exception as E
import Control.Monad.Except (catchError, throwError)
import Control.Monad import Control.Monad
import Control.Monad.Trans import Control.Monad.Trans
import Data.Aeson (eitherDecode', encode) import Data.Aeson (eitherDecode', encode)
@ -70,7 +71,7 @@ import System.IO.Error (isDoesNotExistError)
import Text.Pandoc import Text.Pandoc
import Text.Pandoc.Builder (setMeta) import Text.Pandoc.Builder (setMeta)
import Text.Pandoc.Class (PandocIO, getLog, withMediaBag, getMediaBag, import Text.Pandoc.Class (PandocIO, getLog, withMediaBag, getMediaBag,
fetchItem, insertMedia) fetchItem, insertMedia, report)
import Text.Pandoc.Highlighting (highlightingStyles) import Text.Pandoc.Highlighting (highlightingStyles)
import Text.Pandoc.Lua ( runLuaFilter ) import Text.Pandoc.Lua ( runLuaFilter )
import Text.Pandoc.MediaBag (extractMediaBag, mediaDirectory) import Text.Pandoc.MediaBag (extractMediaBag, mediaDirectory)
@ -734,15 +735,23 @@ defaultWriterName x =
fillMedia :: Maybe String -> Pandoc -> PandocIO Pandoc fillMedia :: Maybe String -> Pandoc -> PandocIO Pandoc
fillMedia sourceURL d = walkM handleImage d fillMedia sourceURL d = walkM handleImage d
where handleImage :: Inline -> PandocIO Inline where handleImage :: Inline -> PandocIO Inline
handleImage (Image attr lab (src, tit)) = do handleImage (Image attr lab (src, tit)) = catchError
(bs, mt) <- fetchItem sourceURL src (do (bs, mt) <- fetchItem sourceURL src
let ext = fromMaybe (takeExtension src) let ext = fromMaybe (takeExtension src)
(mt >>= extensionFromMimeType) (mt >>= extensionFromMimeType)
let bs' = B.fromChunks [bs] let bs' = B.fromChunks [bs]
let basename = showDigest $ sha1 bs' let basename = showDigest $ sha1 bs'
let fname = basename <.> ext let fname = basename <.> ext
insertMedia fname mt bs' insertMedia fname mt bs'
return $ Image attr lab (fname, tit) return $ Image attr lab (fname, tit))
(\e -> do
case e of
PandocResourceNotFound _ -> do
report $ CouldNotFetchResource src
"replacing image with description"
-- emit alt text
return $ Span ("",["image"],[]) lab
_ -> throwError e)
handleImage x = return x handleImage x = return x
extractMedia :: FilePath -> Pandoc -> PandocIO Pandoc extractMedia :: FilePath -> Pandoc -> PandocIO Pandoc