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

Added a --quiet option to suppress warnings.

Browse source 
Use this also in Tests.Old.
This commit is contained in:
John MacFarlane 2016-12-03 17:17:30 +01:00
parent 2710fc4261
commit 63dc6bd025
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MANUAL.txt
View file

@ -340,6 +340,10 @@ General options
: Give verbose debugging output. Currently this only has an effect : Give verbose debugging output. Currently this only has an effect
with PDF output. with PDF output.
`--quiet`
: Suppress warning messages.
`--list-input-formats` `--list-input-formats`
: List supported input formats, one per line. : List supported input formats, one per line.

29
pandoc.hs
View file

@ -197,6 +197,7 @@ data Opt = Opt
, optDumpArgs :: Bool -- ^ Output command-line arguments , optDumpArgs :: Bool -- ^ Output command-line arguments
, optIgnoreArgs :: Bool -- ^ Ignore command-line arguments , optIgnoreArgs :: Bool -- ^ Ignore command-line arguments
, optVerbose :: Bool -- ^ Verbose diagnostic output , optVerbose :: Bool -- ^ Verbose diagnostic output
, optQuiet :: Bool -- ^ Suppress warnings
, optReferenceLinks :: Bool -- ^ Use reference links in writing markdown, rst , optReferenceLinks :: Bool -- ^ Use reference links in writing markdown, rst
, optReferenceLocation :: ReferenceLocation -- ^ location for footnotes and link references in markdown output , optReferenceLocation :: ReferenceLocation -- ^ location for footnotes and link references in markdown output
, optDpi :: Int -- ^ Dpi , optDpi :: Int -- ^ Dpi
@ -262,6 +263,7 @@ defaultOpts = Opt
, optDumpArgs = False , optDumpArgs = False
, optIgnoreArgs = False , optIgnoreArgs = False
, optVerbose = False , optVerbose = False
, optQuiet = False
, optReferenceLinks = False , optReferenceLinks = False
, optReferenceLocation = EndOfDocument , optReferenceLocation = EndOfDocument
, optDpi = 96 , optDpi = 96
@ -904,6 +906,11 @@ options =
(\opt -> return opt { optVerbose = True })) (\opt -> return opt { optVerbose = True }))
"" -- "Verbose diagnostic output." "" -- "Verbose diagnostic output."
, Option "" ["quiet"]
(NoArg
(\opt -> return opt { optQuiet = True }))
"" -- "Suppress warnings."
, Option "" ["bash-completion"] , Option "" ["bash-completion"]
(NoArg (NoArg
(\_ -> do (\_ -> do
@ -1188,6 +1195,7 @@ convertWithOpts opts args = do
, optDumpArgs = dumpArgs , optDumpArgs = dumpArgs
, optIgnoreArgs = ignoreArgs , optIgnoreArgs = ignoreArgs
, optVerbose = verbose , optVerbose = verbose
, optQuiet = quiet
, optReferenceLinks = referenceLinks , optReferenceLinks = referenceLinks
, optReferenceLocation = referenceLocation , optReferenceLocation = referenceLocation
, optDpi = dpi , optDpi = dpi
@ -1407,6 +1415,11 @@ convertWithOpts opts args = do
then handleIncludes then handleIncludes
else return . Right else return . Right
let runIO' = runIOorExplode .
(if quiet
then id
else withWarningsToStderr)
let sourceToDoc :: [FilePath] -> IO (Pandoc, MediaBag) let sourceToDoc :: [FilePath] -> IO (Pandoc, MediaBag)
sourceToDoc sources' = sourceToDoc sources' =
case reader of case reader of
@ -1414,14 +1427,12 @@ convertWithOpts opts args = do
srcs <- convertTabs . intercalate "\n" <$> readSources sources' srcs <- convertTabs . intercalate "\n" <$> readSources sources'
doc <- handleIncludes' srcs doc <- handleIncludes' srcs
case doc of case doc of
Right doc' -> runIOorExplode $ withMediaBag Right doc' -> runIO' $ withMediaBag
$ withWarningsToStderr $ r readerOpts doc'
$ r readerOpts doc'
Left e -> error $ show e Left e -> error $ show e
ByteStringReader r -> readFiles sources' >>= ByteStringReader r -> readFiles sources' >>=
(\bs -> runIOorExplode $ withMediaBag (\bs -> runIO' $ withMediaBag
$ withWarningsToStderr $ r readerOpts bs)
$ r readerOpts bs)
-- We parse first if (1) fileScope is set, (2), it's a binary -- We parse first if (1) fileScope is set, (2), it's a binary
-- reader, or (3) we're reading JSON. This is easier to do of an AND -- reader, or (3) we're reading JSON. This is easier to do of an AND
@ -1493,8 +1504,7 @@ convertWithOpts opts args = do
case writer of case writer of
-- StringWriter f -> f writerOptions doc' >>= writerFn outputFile -- StringWriter f -> f writerOptions doc' >>= writerFn outputFile
ByteStringWriter f -> (runIOorExplode $ withWarningsToStderr ByteStringWriter f -> (runIO' $ f writerOptions doc')
$ f writerOptions doc')
>>= writeFnBinary outputFile >>= writeFnBinary outputFile
StringWriter f StringWriter f
| pdfOutput -> do | pdfOutput -> do
@ -1529,6 +1539,5 @@ convertWithOpts opts args = do
handleEntities = if htmlFormat && ascii handleEntities = if htmlFormat && ascii
then toEntities then toEntities
else id else id
output <- runIOorExplode $ withWarningsToStderr output <- runIO' $ f writerOptions doc'
$ f writerOptions doc'
selfcontain (output ++ ['\n' | not standalone']) >>= writerFn outputFile . handleEntities selfcontain (output ++ ['\n' | not standalone']) >>= writerFn outputFile . handleEntities

2
tests/Tests/Old.hs
View file

@ -261,7 +261,7 @@ testWithNormalize normalizer testname opts inp norm = testCase testname $ do
(outputPath, hOut) <- openTempFile "" "pandoc-test" (outputPath, hOut) <- openTempFile "" "pandoc-test"
let inpPath = inp let inpPath = inp
let normPath = norm let normPath = norm
let options = ["--data-dir", ".." </> "data"] ++ [inpPath] ++ opts let options = ["--quiet", "--data-dir", ".." </> "data"] ++ [inpPath] ++ opts
let cmd = pandocPath ++ " " ++ unwords options let cmd = pandocPath ++ " " ++ unwords options
let findDynlibDir [] = Nothing let findDynlibDir [] = Nothing
findDynlibDir ("build":xs) = Just $ joinPath (reverse xs) </> "build" findDynlibDir ("build":xs) = Just $ joinPath (reverse xs) </> "build"