Merge pull request avh4#207 from gyzerok/patch-2

fix avh4#186: make console output less verbose
jmandzik · Jun 24, 2016 · fba3025 · fba3025
2 parents 92716c6 + f2116e9
commit fba3025
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/ElmFormat.hs b/src/ElmFormat.hs
@@ -83,7 +83,6 @@ processTextInput elmVersion destination inputFile inputText =
 processFileInput :: ElmVersion -> FilePath -> Destination -> IO (Maybe Bool)
 processFileInput elmVersion inputFile destination =
     do
-        putStrLn $ (r $ ProcessingFile inputFile)
         inputText <- fmap Text.decodeUtf8 $ ByteString.readFile inputFile
         processTextInput elmVersion destination inputFile inputText
 
@@ -162,6 +161,7 @@ handleFilesInput inputFiles outputFile autoYes validateOnly elmVersion =
             Right [inputFile] -> do
                 realOutputFile <- decideOutputFile autoYes inputFile outputFile
                 let destination = if validateOnly then ValidateOnly else ToFile realOutputFile
+                putStrLn $ (r $ ProcessingFiles $ [inputFile])
                 processFileInput elmVersion inputFile destination
 
             Right elmFiles -> do
@@ -187,6 +187,7 @@ handleFilesInput inputFiles outputFile autoYes validateOnly elmVersion =
                                     ToFile file
                         in
                             do
+                                putStrLn $ (r $ ProcessingFiles elmFiles)
                                 validationResults <- mapM (\file -> processFileInput elmVersion file (dst file)) elmFiles
                                 return $ foldl merge Nothing validationResults
                     else

diff --git a/src/Messages/Strings.hs b/src/Messages/Strings.hs
@@ -38,8 +38,12 @@ renderMessage Error_SingleOutputWithMultipleInputs =
     , "Please remove the --output argument. The .elm files in INPUT will be formatted in place."
     ]
 
-renderMessage (ProcessingFile file) =
-    "Processing file " ++ file
+renderMessage (ProcessingFiles files) =
+    case files of
+        file:[] ->
+            "Processing file " ++ file
+        _ ->
+            "Processing multiple files..."
 
 renderMessage (FileWouldChange file) =
     "File would be changed " ++ file

diff --git a/src/Messages/Types.hs b/src/Messages/Types.hs
@@ -13,7 +13,7 @@ data Message
   | Error_SingleOutputWithMultipleInputs
   | Error_TooManyInputs
   | Error_OutputAndValidate
-  | ProcessingFile FilePath
+  | ProcessingFiles [FilePath]
   | FileWouldChange FilePath