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

App: change readSource(s) to use Text instead of String.

Browse source
This commit is contained in:
John MacFarlane 2017-06-10 15:55:18 +02:00
parent c691b97506
commit 627e27fc1e
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,9 @@ import Data.List (intercalate, isPrefixOf, isSuffixOf, sort)
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe (fromMaybe, isJust, isNothing) import Data.Maybe (fromMaybe, isJust, isNothing)
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.IO as T
import Data.Yaml (decode) import Data.Yaml (decode)
import qualified Data.Yaml as Yaml import qualified Data.Yaml as Yaml
import GHC.Generics import GHC.Generics
@ -381,8 +383,8 @@ convertWithOpts opts = do
then 0 then 0
else optTabStop opts) else optTabStop opts)
readSources :: [FilePath] -> PandocIO String readSources :: [FilePath] -> PandocIO Text
readSources srcs = convertTabs . intercalate "\n" <$> readSources srcs = convertTabs . T.intercalate (T.pack "\n") <$>
mapM readSource srcs mapM readSource srcs
let runIO' :: PandocIO a -> IO a let runIO' :: PandocIO a -> IO a
@ -405,9 +407,9 @@ convertWithOpts opts = do
case reader of case reader of
StringReader r StringReader r
| optFileScope opts || readerName == "json" -> | optFileScope opts || readerName == "json" ->
mconcat <$> mapM (readSource >=> r readerOpts) sources mconcat <$> mapM (readSource >=> r readerOpts . T.unpack) sources
| otherwise -> | otherwise ->
readSources sources' >>= r readerOpts readSources sources' >>= r readerOpts . T.unpack
ByteStringReader r -> ByteStringReader r ->
mconcat <$> mapM (readFile' >=> r readerOpts) sources mconcat <$> mapM (readFile' >=> r readerOpts) sources
@ -782,21 +784,23 @@ applyFilters mbDatadir filters args d = do
expandedFilters <- mapM (expandFilterPath mbDatadir) filters expandedFilters <- mapM (expandFilterPath mbDatadir) filters
foldrM ($) d $ map (flip externalFilter args) expandedFilters foldrM ($) d $ map (flip externalFilter args) expandedFilters
readSource :: FilePath -> PandocIO String readSource :: FilePath -> PandocIO Text
readSource "-" = liftIO UTF8.getContents readSource "-" = liftIO T.getContents
readSource src = case parseURI src of readSource src = case parseURI src of
Just u | uriScheme u `elem` ["http:","https:"] -> Just u | uriScheme u `elem` ["http:","https:"] ->
readURI src readURI src
| uriScheme u == "file:" -> | uriScheme u == "file:" ->
liftIO $ UTF8.readFile (uriPath u) liftIO $ UTF8.toText <$>
_ -> liftIO $ UTF8.readFile src BS.readFile (uriPath u)
_ -> liftIO $ UTF8.toText <$>
BS.readFile src
readURI :: FilePath -> PandocIO String readURI :: FilePath -> PandocIO Text
readURI src = do readURI src = do
res <- liftIO $ openURL src res <- liftIO $ openURL src
case res of case res of
Left e -> throwError $ PandocHttpError src e Left e -> throwError $ PandocHttpError src e
Right (contents, _) -> return $ UTF8.toString contents Right (contents, _) -> return $ UTF8.toText contents
readFile' :: MonadIO m => FilePath -> m B.ByteString readFile' :: MonadIO m => FilePath -> m B.ByteString
readFile' "-" = liftIO B.getContents readFile' "-" = liftIO B.getContents