Logging: Added UnknownExtensions constructor to LogMessage.

[API change]

Issue this warning when we're falling back to markdown or
html because we don't recognize the extension of the input or
output files.

3 files changed, 58 insertions, 39 deletions

diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs
index d48ae1932..f96f67314 100644
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -26,6 +26,7 @@ import Prelude
 import qualified Control.Exception as E
 import Control.Monad
 import Control.Monad.Trans
+import Control.Monad.Except (throwError)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as B
 import Data.Char (toLower)
@@ -101,40 +102,6 @@ convertWithOpts opts = do
                     selectUserDataDir ds
                   Just _    -> return $ optDataDir opts
 
-  -- assign reader and writer based on options and filenames
-  let readerName = case optReader opts of
-                     Just f  -> f
-                     Nothing -> fromMaybe fallback $
-                                  formatFromFilePaths sources
-                       where fallback = if any isURI sources
-                                           then "html"
-                                           else "markdown"
-
-  let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
-
-  -- TODO: we have to get the input and the output into the state for
-  -- the sake of the text2tags reader.
-  (reader, readerExts) <-
-           case getReader readerName of
-                Right (r, es) -> return (r :: Reader PandocIO, es)
-                Left e   -> E.throwIO $ PandocAppError e'
-                  where e' = case readerName of
-                                  "pdf" -> e ++
-                                     "\nPandoc can convert to PDF, but not from PDF."
-                                  "doc" -> e ++
-                                     "\nPandoc can convert from DOCX, but not from DOC.\nTry using Word to save your DOC file as DOCX, and convert that with pandoc."
-                                  _ -> e
-
-  let convertTabs = tabFilter (if optPreserveTabs opts ||
-                                    readerName == "t2t" ||
-                                    readerName == "man"
-                                  then 0
-                                  else optTabStop opts)
-
-      readSources :: [FilePath] -> PandocIO Text
-      readSources srcs = convertTabs . T.intercalate (T.pack "\n") <$>
-                            mapM readSource srcs
-
   let runIO' :: PandocIO a -> IO a
       runIO' f = do
         (res, reports) <- runIOorExplode $ do
@@ -161,6 +128,43 @@ convertWithOpts opts = do
     setInputFiles (optInputFiles opts)
     setOutputFile (optOutputFile opts)
 
+    -- assign reader and writer based on options and filenames
+    readerName <- case optReader opts of
+                       Just f  -> return f
+                       Nothing -> case formatFromFilePaths sources of
+                           Just f' -> return f'
+                           Nothing | sources == ["-"] -> return "markdown"
+                                   | any isURI sources -> return "html"
+                                   | otherwise -> do
+                             report $ UnknownExtensions
+                                 (map takeExtension sources) "markdown"
+                             return "markdown"
+
+    let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
+
+    (reader, readerExts) <-
+             case getReader readerName of
+                  Right (r, es) -> return (r :: Reader PandocIO, es)
+                  Left e   -> throwError $ PandocAppError e'
+                    where e' = case readerName of
+                                    "pdf" -> e ++
+                                       "\nPandoc can convert to PDF, but not from PDF."
+                                    "doc" -> e ++
+                                       "\nPandoc can convert from DOCX, but not from DOC.\nTry using Word to save your DOC file as DOCX, and convert that with pandoc."
+                                    _ -> e
+
+    let convertTabs = tabFilter (if optPreserveTabs opts ||
+                                      readerName == "t2t" ||
+                                      readerName == "man"
+                                    then 0
+                                    else optTabStop opts)
+
+
+    let readSources :: [FilePath] -> PandocIO Text
+        readSources srcs = convertTabs . T.intercalate (T.pack "\n") <$>
+                              mapM readSource srcs
+
+
     outputSettings <- optToOutputSettings opts
     let format = outputFormat outputSettings
     let writer = outputWriter outputSettings
@@ -180,7 +184,7 @@ convertWithOpts opts = do
     istty <- liftIO $ queryTerminal stdOutput
 #endif
     when (not (isTextFormat format) && istty && isNothing ( optOutputFile opts)) $
-      liftIO $ E.throwIO $ PandocAppError $
+      throwError $ PandocAppError $
               "Cannot write " ++ format ++ " output to terminal.\n" ++
               "Specify an output file using the -o option, or " ++
               "use '-o -' to force output to stdout."
diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs
index a9034d6f2..31bd64c4c 100644
--- a/src/Text/Pandoc/App/OutputSettings.hs
+++ b/src/Text/Pandoc/App/OutputSettings.hs
@@ -70,9 +70,15 @@ optToOutputSettings opts = do
     if pdfOutput
        then liftIO $ pdfWriterAndProg (optWriter opts) (optPdfEngine opts)
        else case optWriter opts of
-              Nothing  ->
-                return (fromMaybe "html" $ formatFromFilePaths [outputFile],
-                        Nothing)
+              Nothing
+                | outputFile == "-" -> return ("html", Nothing)
+                | otherwise ->
+                    case formatFromFilePaths [outputFile] of
+                           Nothing -> do
+                             report $ UnknownExtensions
+                                [takeExtension outputFile] "html"
+                             return ("html", Nothing)
+                           Just f  -> return (f, Nothing)
               Just f   -> return (f, Nothing)
 
   let format = if ".lua" `isSuffixOf` writerName
diff --git a/src/Text/Pandoc/Logging.hs b/src/Text/Pandoc/Logging.hs
index 188702367..4107dc121 100644
--- a/src/Text/Pandoc/Logging.hs
+++ b/src/Text/Pandoc/Logging.hs
@@ -30,7 +30,7 @@ import Data.Aeson.Encode.Pretty (Config (..), defConfig, encodePretty',
                                  keyOrder)
 import qualified Data.ByteString.Lazy as BL
 import Data.Data (Data, toConstr)
-import Data.List (isSuffixOf)
+import Data.List (isSuffixOf, intercalate)
 import qualified Data.Text as Text
 import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
@@ -88,6 +88,7 @@ data LogMessage =
   | CouldNotLoadTranslations String String
   | UnexpectedXmlElement String String
   | UnknownOrgExportOption String
+  | UnknownExtensions [String] String
   deriving (Show, Eq, Data, Ord, Typeable, Generic)
 
 instance ToJSON LogMessage where
@@ -207,6 +208,9 @@ instance ToJSON LogMessage where
             "parent" .= Text.pack parent]
       UnknownOrgExportOption option ->
            ["option" .= Text.pack option]
+      UnknownExtensions exts format ->
+           ["extensions" .= map Text.pack exts
+           ,"format" .= Text.pack format]
 
 
 showPos :: SourcePos -> String
@@ -310,6 +314,10 @@ showLogMessage msg =
          "Unexpected XML element " ++ element ++ " in " ++ parent
        UnknownOrgExportOption option ->
          "Ignoring unknown Org export option: " ++ option
+       UnknownExtensions exts format ->
+         "Could not deduce format from file extension " ++
+         intercalate " or " exts ++ "\n" ++
+         "Defaulting to " ++ format
 
 messageVerbosity:: LogMessage -> Verbosity
 messageVerbosity msg =
@@ -351,3 +359,4 @@ messageVerbosity msg =
        CouldNotLoadTranslations{}   -> WARNING
        UnexpectedXmlElement {}      -> WARNING
        UnknownOrgExportOption {}    -> WARNING
+       UnknownExtensions{}          -> WARNING