git.iko.soy/typeable/pandoc
on master help sign in
Lua filters: make sure whole CommonState is passed through...

to insertResource (`fetch`).

commit896c288625a8c48e290fe86e90b65109bd4fce9f authorJohn MacFarlane <jgm@berkeley.edu> dateSat 30 Sep 2017, 17:19 (9 years ago) parent99aba1e
2 files changed+22−14
compare with master
unifiedsplit
src/Text/Pandoc/Lua.hs+8−5 src/Text/Pandoc/Lua/PandocModule.hs+14−9
src/Text/Pandoc/Lua.hs+8−5
@@ -44,7 +44,8 @@ import Data.Map (Map)
4444import Data.Maybe (isJust)
4545import Foreign.Lua (Lua, FromLuaStack (peek), LuaException (..), StackIndex,
4646 Status (OK), ToLuaStack (push))
47−import Text.Pandoc.Class (PandocIO, getMediaBag, setMediaBag)
47+import Text.Pandoc.Class (PandocIO, getMediaBag, setMediaBag,
48+ getCommonState, CommonState)
4849import Text.Pandoc.MediaBag (MediaBag)
4950import Text.Pandoc.Definition
5051import Text.Pandoc.Lua.PandocModule (pushPandocModule, pushMediaBagModule)
@@ -56,17 +57,19 @@ import qualified Foreign.Lua as Lua
5657runLuaFilter :: Maybe FilePath -> FilePath -> String
5758 -> Pandoc -> PandocIO (Either LuaException Pandoc)
5859runLuaFilter datadir filterPath format pd = do
60+ commonState <- getCommonState
5961 mediaBag <- getMediaBag
6062 mediaBagRef <- liftIO (newIORef mediaBag)
6163 res <- liftIO . Lua.runLuaEither $
62− runLuaFilter' datadir filterPath format mediaBagRef pd
64+ runLuaFilter' commonState datadir filterPath format mediaBagRef pd
6365 newMediaBag <- liftIO (readIORef mediaBagRef)
6466 setMediaBag newMediaBag
6567 return res
6668
67−runLuaFilter' :: Maybe FilePath -> FilePath -> String -> IORef MediaBag
69+runLuaFilter' :: CommonState
70+ -> Maybe FilePath -> FilePath -> String -> IORef MediaBag
6871 -> Pandoc -> Lua Pandoc
69−runLuaFilter' datadir filterPath format mbRef pd = do
72+runLuaFilter' commonState datadir filterPath format mbRef pd = do
7073 Lua.openlibs
7174 -- store module in global "pandoc"
7275 pushPandocModule datadir
@@ -89,7 +92,7 @@ runLuaFilter' datadir filterPath format mbRef pd = do
8992 addMediaBagModule = do
9093 Lua.getglobal "pandoc"
9194 push "mediabag"
92− pushMediaBagModule mbRef
95+ pushMediaBagModule commonState mbRef
9396 Lua.rawset (-3)
9497 registerFormat = do
9598 push format
src/Text/Pandoc/Lua/PandocModule.hs+14−9
@@ -41,7 +41,8 @@ import Data.IORef
4141import Data.Text (pack)
4242import Foreign.Lua (Lua, FromLuaStack, ToLuaStack, NumResults, liftIO)
4343import Text.Pandoc.Class (fetchMediaResource, readDataFile, runIO,
44− runIOorExplode, setUserDataDir)
44+ runIOorExplode, setUserDataDir, CommonState(..),
45+ putCommonState)
4546import Text.Pandoc.Options (ReaderOptions(readerExtensions))
4647import Text.Pandoc.Lua.StackInstances ()
4748import Text.Pandoc.Readers (Reader (..), getReader)
@@ -83,13 +84,13 @@ readDoc formatSpec content = do
8384--
8485-- MediaBag submodule
8586--
86−pushMediaBagModule :: IORef MB.MediaBag -> Lua ()
87−pushMediaBagModule mediaBagRef = do
87+pushMediaBagModule :: CommonState -> IORef MB.MediaBag -> Lua ()
88+pushMediaBagModule commonState mediaBagRef = do
8889 Lua.newtable
8990 addFunction "insert" (insertMediaFn mediaBagRef)
9091 addFunction "lookup" (lookupMediaFn mediaBagRef)
9192 addFunction "list" (mediaDirectoryFn mediaBagRef)
92− addFunction "fetch" (insertResource mediaBagRef)
93+ addFunction "fetch" (insertResource commonState mediaBagRef)
9394 return ()
9495 where
9596 addFunction name fn = do
@@ -103,7 +104,8 @@ insertMediaFn :: IORef MB.MediaBag
103104 -> BL.ByteString
104105 -> Lua NumResults
105106insertMediaFn mbRef fp nilOrMime contents = do
106− liftIO . modifyIORef' mbRef $ MB.insertMedia fp (toMaybe nilOrMime) contents
107+ liftIO . modifyIORef' mbRef $
108+ MB.insertMedia fp (toMaybe nilOrMime) contents
107109 return 0
108110
109111lookupMediaFn :: IORef MB.MediaBag
@@ -134,12 +136,15 @@ mediaDirectoryFn mbRef = do
134136 Lua.push "length" *> Lua.push contentLength *> Lua.rawset (-3)
135137 Lua.rawseti (-2) idx
136138
137−insertResource :: IORef MB.MediaBag
139+insertResource :: CommonState
140+ -> IORef MB.MediaBag
138141 -> String
139142 -> Lua NumResults
140−insertResource mbRef src = do
141− (fp, mimeType, bs) <- liftIO . runIOorExplode $ fetchMediaResource src
142− liftIO $ print (fp, mimeType)
143+insertResource commonState mbRef src = do
144+ (fp, mimeType, bs) <- liftIO . runIOorExplode $ do
145+ putCommonState commonState
146+ fetchMediaResource src
147+ liftIO $ print (fp, mimeType) -- TODO DEBUG
143148 insertMediaFn mbRef fp (OrNil mimeType) bs
144149
145150--