git.iko.soy/typeable/pandoc
on master help sign in
Introduce DeferredMediaBag.
5814096Jesse Rosenthal
src/Text/Pandoc/Class.hs+24
compare with master
unifiedsplit
@@ -100,6 +100,7 @@ import Data.Default
100import System.IO.Error
100import System.IO.Error
101import qualified Data.Map as M
101import qualified Data.Map as M
102import Text.Pandoc.Error
102import Text.Pandoc.Error
103+import Data.Monoid
103
104
104class (Functor m, Applicative m, Monad m, MonadError PandocError m)
105class (Functor m, Applicative m, Monad m, MonadError PandocError m)
105 => PandocMonad m where
106 => PandocMonad m where
@@ -167,6 +168,29 @@ warningWithPos pos msg = lift $ warning $ msg ++ " " ++ show pos
167
168
168--
169--
169
170
171+newtype DeferredMediaPath = DeferredMediaPath {unDefer :: String}
172+ deriving (Show, Eq)
173+
174+data DeferredMediaBag = DeferredMediaBag MediaBag [DeferredMediaPath]
175+ deriving (Show)
176+
177+instance Monoid DeferredMediaBag where
178+ mempty = DeferredMediaBag mempty mempty
179+ mappend (DeferredMediaBag mb lst) (DeferredMediaBag mb' lst') =
180+ DeferredMediaBag (mb <> mb') (lst <> lst')
181+
182+getDeferredMedia :: PandocMonad m => DeferredMediaBag -> m MediaBag
183+getDeferredMedia (DeferredMediaBag mb defMedia) = do
184+ fetchedMedia <- mapM (\dfp -> fetchItem Nothing (unDefer dfp)) defMedia
185+ return $ foldr
186+ (\(dfp, (bs, mbMime)) mb' ->
187+ MB.insertMedia (unDefer dfp) mbMime (BL.fromStrict bs) mb')
188+ mb
189+ (zip defMedia fetchedMedia)
190+
191+dropDeferredMedia :: DeferredMediaBag -> MediaBag
192+dropDeferredMedia (DeferredMediaBag mb _) = mb
193+
170data CommonState = CommonState { stWarnings :: [String]
194data CommonState = CommonState { stWarnings :: [String]
171 , stMediaBag :: MediaBag
195 , stMediaBag :: MediaBag
172 , stInputFiles :: Maybe [FilePath]
196 , stInputFiles :: Maybe [FilePath]