@@ -1,5 +1,6 @@
11{-# LANGUAGE DeriveFunctor, DeriveDataTypeable, TypeSynonymInstances,
2−FlexibleInstances, GeneralizedNewtypeDeriving, FlexibleContexts #-}
2+FlexibleInstances, GeneralizedNewtypeDeriving, FlexibleContexts,
3+StandaloneDeriving #-}
34
45{-
56Copyright (C) 2016 Jesse Rosenthal <jrosenthal@jhu.edu>
@@ -50,6 +51,8 @@ module Text.Pandoc.Class ( PandocMonad(..)
5051 , fetchItem
5152 , getInputFiles
5253 , getOutputFile
54+ , setResourcePath
55+ , getResourcePath
5356 , PandocIO(..)
5457 , PandocPure(..)
5558 , FileTree(..)
@@ -88,7 +91,7 @@ import qualified Data.ByteString as B
8891import qualified Data.ByteString.Lazy as BL
8992import qualified System.Environment as IO (lookupEnv)
9093import System.FilePath.Glob (match, compile)
91−import System.FilePath ((</>), takeExtension, dropExtension)
94+import System.FilePath ((</>), takeExtension, dropExtension, isRelative)
9295import qualified System.FilePath.Glob as IO (glob)
9396import qualified System.Directory as IO (getModificationTime)
9497import Control.Monad as M (fail)
@@ -165,6 +168,12 @@ getInputFiles = getsCommonState stInputFiles
165168getOutputFile :: PandocMonad m => m (Maybe FilePath)
166169getOutputFile = getsCommonState stOutputFile
167170
171+setResourcePath :: PandocMonad m => [FilePath] -> m ()
172+setResourcePath ps = modifyCommonState $ \st -> st{stResourcePath = ps}
173+
174+getResourcePath :: PandocMonad m => m [FilePath]
175+getResourcePath = getsCommonState stResourcePath
176+
168177getPOSIXTime :: (PandocMonad m) => m POSIXTime
169178getPOSIXTime = utcTimeToPOSIXSeconds <$> getCurrentTime
170179
@@ -183,11 +192,12 @@ readFileFromDirs (d:ds) f = catchError
183192
184193--
185194
186−data CommonState = CommonState { stLog :: [LogMessage]
187− , stMediaBag :: MediaBag
188− , stInputFiles :: Maybe [FilePath]
189− , stOutputFile :: Maybe FilePath
190− , stVerbosity :: Verbosity
195+data CommonState = CommonState { stLog :: [LogMessage]
196+ , stMediaBag :: MediaBag
197+ , stInputFiles :: Maybe [FilePath]
198+ , stOutputFile :: Maybe FilePath
199+ , stResourcePath :: [FilePath]
200+ , stVerbosity :: Verbosity
191201 }
192202
193203instance Default CommonState where
@@ -195,6 +205,7 @@ instance Default CommonState where
195205 , stMediaBag = mempty
196206 , stInputFiles = Nothing
197207 , stOutputFile = Nothing
208+ , stResourcePath = ["."]
198209 , stVerbosity = WARNING
199210 }
200211
@@ -289,7 +300,10 @@ downloadOrRead sourceURL s = do
289300 readLocalFile $ dropWhile (=='/') (uriPath u')
290301 _ -> readLocalFile fp -- get from local file system
291302 where readLocalFile f = do
292− cont <- readFileStrict f
303+ resourcePath <- getResourcePath
304+ cont <- if isRelative f
305+ then withPaths resourcePath readFileStrict f
306+ else readFileStrict f
293307 return (cont, mime)
294308 httpcolon = URI{ uriScheme = "http:",
295309 uriAuthority = Nothing,
@@ -306,6 +320,16 @@ downloadOrRead sourceURL s = do
306320 convertSlash '\\' = '/'
307321 convertSlash x = x
308322
323+withPaths :: PandocMonad m => [FilePath] -> (FilePath -> m a) -> FilePath -> m a
324+withPaths [] _ fp = throwError $ PandocIOError fp
325+ (userError "file not found in resource path")
326+withPaths (p:ps) action fp =
327+ catchError (do res <- action (p </> fp)
328+ when (p /= ".") $
329+ report $ UsingResourceFrom fp p
330+ return res)
331+ (\_ -> withPaths ps action fp)
332+
309333data PureState = PureState { stStdGen :: StdGen
310334 , stWord8Store :: [Word8] -- should be
311335 -- inifinite,