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

Avoid a pointless Text -> String conversion on output.

Browse source
This commit is contained in:
John MacFarlane 2019-08-07 09:23:59 -07:00
parent ec55382f8d
commit 87ce1ffbd9
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,15 +34,16 @@ import Data.Maybe (fromMaybe, isJust, isNothing)
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.IO as TIO
import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy as TL
import qualified Data.Text.Lazy.Encoding as TE
import qualified Data.Text.Encoding.Error as TE import qualified Data.Text.Encoding.Error as TE
import qualified Data.Text.Encoding.Error as TSE import qualified Data.Text.Lazy.Encoding as TLE
import Network.URI (URI (..), parseURI) import Network.URI (URI (..), parseURI)
import System.Directory (doesDirectoryExist) import System.Directory (doesDirectoryExist)
import System.Exit (exitSuccess) import System.Exit (exitSuccess)
import System.FilePath import System.FilePath
import System.IO (nativeNewline, stdout) import System.IO (nativeNewline, stdout, hSetNewlineMode, hSetEncoding,
NewlineMode(..), utf8)
import qualified System.IO as IO (Newline (..)) import qualified System.IO as IO (Newline (..))
import Text.Pandoc import Text.Pandoc
import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths) import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths)
@ -295,7 +296,7 @@ convertWithOpts opts = do
case res of case res of
Right pdf -> writeFnBinary outputFile pdf Right pdf -> writeFnBinary outputFile pdf
Left err' -> throwError $ PandocPDFError $ Left err' -> throwError $ PandocPDFError $
TL.unpack (TE.decodeUtf8With TE.lenientDecode err') TL.unpack (TLE.decodeUtf8With TE.lenientDecode err')
Nothing -> do Nothing -> do
let addNl = if standalone let addNl = if standalone
@ -365,7 +366,7 @@ readSource src = case parseURI src of
else BS.readFile fp else BS.readFile fp
E.catch (return $! UTF8.toText bs) E.catch (return $! UTF8.toText bs)
(\e -> case e of (\e -> case e of
TSE.DecodeError _ (Just w) -> do TE.DecodeError _ (Just w) -> do
case BS.elemIndex w bs of case BS.elemIndex w bs of
Just offset -> E.throwIO $ Just offset -> E.throwIO $
PandocUTF8DecodingError fp offset w PandocUTF8DecodingError fp offset w
@ -384,6 +385,11 @@ writeFnBinary "-" = liftIO . BL.putStr
writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f) writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f)
writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m () writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m ()
-- TODO this implementation isn't maximally efficient: writerFn eol "-" t = liftIO $ do
writerFn eol "-" = liftIO . UTF8.putStrWith eol . T.unpack hSetNewlineMode stdout (NewlineMode eol eol)
writerFn eol f = liftIO . UTF8.writeFileWith eol f . T.unpack hSetEncoding stdout utf8
TIO.putStr t
writerFn eol f t = liftIO $ do
hSetNewlineMode stdout (NewlineMode eol eol)
hSetEncoding stdout utf8
TIO.writeFile f t