diff options
Diffstat (limited to 'pandoc-server')
| -rw-r--r-- | pandoc-server/src/Text/Pandoc/Server.hs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pandoc-server/src/Text/Pandoc/Server.hs b/pandoc-server/src/Text/Pandoc/Server.hs index 1c66a66db..c45dfa381 100644 --- a/pandoc-server/src/Text/Pandoc/Server.hs +++ b/pandoc-server/src/Text/Pandoc/Server.hs @@ -31,7 +31,7 @@ import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as BL import Data.ByteString.Base64 (decodeBase64, encodeBase64) import Data.Default -import Control.Monad (when, foldM) +import Control.Monad (when, unless, foldM) import qualified Data.Set as Set import Skylighting (defaultSyntaxMap) import qualified Data.Map as M @@ -79,14 +79,14 @@ cliOptions = prg <- getProgName let header = "Usage: " <> prg <> " [OPTION...]" putStrLn $ usageInfo header cliOptions - exitWith ExitSuccess)) + exitSuccess)) "help message" , Option ['v'] ["version"] (NoArg (\_ -> do prg <- getProgName putStrLn $ prg <> " " <> T.unpack pandocVersionText - exitWith ExitSuccess)) + exitSuccess)) "version info" ] @@ -100,7 +100,7 @@ parseServerOptsFromArgs args = do E.throwIO $ PandocOptionError $ T.pack $ concat es ++ unlines (map handleUnknownOpt unrecognizedOpts) ++ ("Try --help for more information.") - when (not (null ns)) $ + unless (null ns) $ E.throwIO $ PandocOptionError $ T.pack $ "Unknown arguments: " <> unwords ns foldM (flip ($)) defaultServerOpts os @@ -235,13 +235,9 @@ server = convertBytes convertJSON params = handleErrJSON $ runPure (convert' - (\t -> do - msgs <- getLog - return $ Succeeded t False (map toMessage msgs)) - (\bs -> do - msgs <- getLog - return $ Succeeded (encodeBase64 (BL.toStrict bs)) True - (map toMessage msgs)) + (\t -> Succeeded t False . map toMessage <$> getLog) + (\bs -> Succeeded (encodeBase64 (BL.toStrict bs)) True + . map toMessage <$> getLog) params) toMessage m = Message { verbosity = messageVerbosity m |