7d67830 · typeable/pandoc

git.iko.soy/typeable/pandoc

LogMessage: change UnknownExtension -> CouldNotDeduceFormat

commit7d6783006aef81c580bbbbc9182c0c39ad5384c1 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 27 Sep 2019, 09:27 (7 years ago) parentd98dde0

3 files changed+6−6

compare with master

unifiedsplit

src/Text/Pandoc/App.hs+1−1 src/Text/Pandoc/App/OutputSettings.hs+1−1 src/Text/Pandoc/Logging.hs+4−4

src/Text/Pandoc/App.hs+1−1

@@ -141,7 +141,7 @@ convertWithOpts opts = do

141141 Nothing | sources == ["-"] -> return "markdown"

142142 | any isURI sources -> return "html"

143143 | otherwise -> do

144− report $ UnknownExtensions

144+ report $ CouldNotDeduceFormat

145145 (map takeExtension sources) "markdown"

146146 return "markdown"

147147

src/Text/Pandoc/App/OutputSettings.hs+1−1

@@ -75,7 +75,7 @@ optToOutputSettings opts = do

7575 | otherwise ->

7676 case formatFromFilePaths [outputFile] of

7777 Nothing -> do

78− report $ UnknownExtensions

78+ report $ CouldNotDeduceFormat

7979 [takeExtension outputFile] "html"

8080 return ("html", Nothing)

8181 Just f -> return (f, Nothing)

src/Text/Pandoc/Logging.hs+4−4

@@ -89,7 +89,7 @@ data LogMessage =

8989 | UnusualConversion String

9090 | UnexpectedXmlElement String String

9191 | UnknownOrgExportOption String

92− | UnknownExtensions [String] String

92+ | CouldNotDeduceFormat [String] String

9393 deriving (Show, Eq, Data, Ord, Typeable, Generic)

9494

9595instance ToJSON LogMessage where

@@ -211,7 +211,7 @@ instance ToJSON LogMessage where

211211 "parent" .= Text.pack parent]

212212 UnknownOrgExportOption option ->

213213 ["option" .= Text.pack option]

214− UnknownExtensions exts format ->

214+ CouldNotDeduceFormat exts format ->

215215 ["extensions" .= map Text.pack exts

216216 ,"format" .= Text.pack format]

217217

@@ -319,7 +319,7 @@ showLogMessage msg =

319319 "Unexpected XML element " ++ element ++ " in " ++ parent

320320 UnknownOrgExportOption option ->

321321 "Ignoring unknown Org export option: " ++ option

322− UnknownExtensions exts format ->

322+ CouldNotDeduceFormat exts format ->

323323 "Could not deduce format from file extension " ++

324324 intercalate " or " exts ++ "\n" ++

325325 "Defaulting to " ++ format

@@ -365,4 +365,4 @@ messageVerbosity msg =

365365 UnusualConversion {} -> WARNING

366366 UnexpectedXmlElement {} -> WARNING

367367 UnknownOrgExportOption {} -> WARNING

368− UnknownExtensions{} -> WARNING

368+ CouldNotDeduceFormat{} -> WARNING