fad620c · typeable/pandoc

git.iko.soy/typeable/pandoc

Changed readDataFile to look first in user data directory.

This way all of the pandoc data files can be overridden by user files. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1693 788f1e2b-df1e-0410-8736-df70ead52e1b

commitfad620c0042fd55de44c0624c9ac8c726b6311c2 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 31 Dec 2009, 01:11 (17 years ago) parent9eb435d

2 files changed+7−21

compare with master

unifiedsplit

src/Text/Pandoc/Shared.hs+6−3 src/Text/Pandoc/Templates.hs+1−18

src/Text/Pandoc/Shared.hs+6−3

@@ -118,13 +118,13 @@ import Data.Char ( toLower, toUpper, ord, isLower, isUpper, isAlpha,

118118import Data.List ( find, isPrefixOf, intercalate )

119119import Network.URI ( parseURI, URI (..), isAllowedInURI )

120120import System.Directory

121+import System.FilePath ( FilePath, (</>) )

121122import Prelude hiding ( putStrLn, writeFile, readFile, getContents )

122123import System.IO.UTF8

123124import Data.Generics

124125import qualified Control.Monad.State as S

125126import Control.Monad (join)

126127import Paths_pandoc (getDataFileName)

127−

128128--

129129-- List processing

130130--

@@ -1033,6 +1033,9 @@ inDirectory path action = do

10331033 setCurrentDirectory oldDir

10341034 return result

10351035

1036−-- | Read file from the Cabal data directory.

1036+-- | Read file from user data directory or, if not found there, from

1037+-- Cabal data directory. On unix the user data directory is @$HOME/.pandoc@.

10371038readDataFile :: FilePath -> IO String

1038−readDataFile fname = getDataFileName fname >>= readFile

1039+readDataFile fname = do

1040+ userDir <- getAppUserDataDirectory "pandoc"

1041+ catch (readFile $ userDir </> fname) (\_ -> getDataFileName fname >>= readFile)

src/Text/Pandoc/Templates.hs+1−18

@@ -49,11 +49,7 @@ import Text.ParserCombinators.Parsec

4949import Control.Monad (liftM)

5050import qualified Control.Exception as E (try, IOException)

5151import System.FilePath

52−import System.Directory

53−import Prelude hiding (readFile)

54−import System.IO.UTF8 (readFile)

5552import Text.Pandoc.Shared (readDataFile)

56−import Paths_pandoc

5753

5854-- | Get the default template, either from the application's user data

5955-- directory (~/.pandoc on unix) or from the cabal data directory.

@@ -62,21 +58,8 @@ getDefaultTemplate "native" = return $ Right ""

6258getDefaultTemplate "odt" = getDefaultTemplate "opendocument"

6359getDefaultTemplate format = do

6460 let format' = takeWhile (/='+') format -- strip off "+lhs" if present

65− ut <- getTemplateFromUserDataDirectory format'

66− case ut of

67− Right t -> return $ Right t

68− Left _ -> getTemplateFromCabalDataDirectory format'

61+ E.try $ readDataFile $ "templates" </> format' <.> "template"

6962

70−getTemplateFromUserDataDirectory :: String -> IO (Either E.IOException String)

71−getTemplateFromUserDataDirectory format = E.try $ do

72− userDir <- getAppUserDataDirectory "pandoc"

73− let templatePath = userDir </> "templates" </> format <.> "template"

74− readFile templatePath

75−

76−getTemplateFromCabalDataDirectory :: String -> IO (Either E.IOException String)

77−getTemplateFromCabalDataDirectory format = E.try $

78− readDataFile $ "templates" </> format <.> "template"

79−

8063-- | Renders a template

8164renderTemplate :: [(String,String)] -- ^ Assoc. list of values for variables

8265 -> String -- ^ Template