From c0cc366f0f2cadebc90eb09ad56c4c7049ee0116 Mon Sep 17 00:00:00 2001
From: Nicolas Mattia <nicolas@nmattia.com>
Date: Sat, 30 Nov 2019 15:58:37 +0100
Subject: [PATCH] Cleanup logger

---
 src/Data/Text/Extended.hs |  6 +++--
 src/Niv/Logger.hs         | 52 ++++++++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/Data/Text/Extended.hs b/src/Data/Text/Extended.hs
index e0dd27e..b869dac 100644
--- a/src/Data/Text/Extended.hs
+++ b/src/Data/Text/Extended.hs
@@ -1,8 +1,10 @@
+{-# LANGUAGE OverloadedStrings #-}
+
 module Data.Text.Extended where
 
+import Niv.Logger
 import System.Exit (exitFailure)
 import qualified Data.Text as T
-import qualified Data.Text.IO as T
 
 tshow :: Show a => a -> T.Text
 tshow = T.pack . show
@@ -10,5 +12,5 @@ tshow = T.pack . show
 -- not quite the perfect place for this
 abort :: T.Text -> IO a
 abort msg = do
-    T.putStrLn msg
+    tsay $ T.unwords [ tbold $ tred "FATAL:", msg ]
     exitFailure
diff --git a/src/Niv/Logger.hs b/src/Niv/Logger.hs
index bc114de..9f93ae3 100644
--- a/src/Niv/Logger.hs
+++ b/src/Niv/Logger.hs
@@ -3,7 +3,17 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
-module Niv.Logger where
+module Niv.Logger
+  ( job
+  , tsay
+  , say
+  , green, tgreen
+  , red, tred
+  , blue, tblue
+  , yellow, tyellow
+  , bold, tbold
+  , faint, tfaint
+  ) where
 
 import Control.Monad
 import Data.Profunctor
@@ -13,6 +23,9 @@ import qualified Data.Text as T
 import UnliftIO
 import qualified System.Console.ANSI as ANSI
 
+type S = String -> String
+type T = T.Text -> T.Text
+
 -- XXX: this assumes as single thread
 job :: String -> IO () -> IO ()
 job str act = do
@@ -45,51 +58,60 @@ say :: String -> IO ()
 say msg = do
     stackSize <- jobStackSize
     let indent = replicate (stackSize * 2) ' '
-    putStrLn $ indent <> msg
+    putStrLn $ unlines $ (indent <>) <$> lines msg
 
-green :: String -> String
+green :: S
 green str =
     ANSI.setSGRCode [ANSI.SetConsoleIntensity ANSI.BoldIntensity] <>
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.Green] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
 
-yellow :: String -> String
+tgreen :: T
+tgreen = t green
+
+yellow :: S
 yellow str =
     ANSI.setSGRCode [ANSI.SetConsoleIntensity ANSI.BoldIntensity] <>
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.Yellow] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
 
-tyellow :: T.Text -> T.Text
-tyellow = dimap T.unpack T.pack yellow
+tyellow :: T
+tyellow = t yellow
 
-blue :: String -> String
+blue :: S
 blue str =
     ANSI.setSGRCode [ANSI.SetConsoleIntensity ANSI.BoldIntensity] <>
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.Blue] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
 
-tblue :: T.Text -> T.Text
-tblue = dimap T.unpack T.pack blue
+tblue :: T
+tblue = t blue
 
-red :: String -> String
+red :: S
 red str =
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.Red] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
 
-tbold :: T.Text -> T.Text
-tbold = dimap T.unpack T.pack bold
+tred :: T
+tred = t red
 
-bold :: String -> String
+bold :: S
 bold str =
     ANSI.setSGRCode [ANSI.SetConsoleIntensity ANSI.BoldIntensity] <>
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.White] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
 
-tfaint :: T.Text -> T.Text
-tfaint = dimap T.unpack T.pack faint
+tbold :: T
+tbold = t bold
 
 faint :: String -> String
 faint str =
     ANSI.setSGRCode [ANSI.SetConsoleIntensity ANSI.FaintIntensity] <>
     ANSI.setSGRCode [ANSI.SetColor ANSI.Foreground ANSI.Vivid ANSI.White] <>
     str <> ANSI.setSGRCode [ANSI.Reset]
+
+tfaint :: T
+tfaint = t faint
+
+t :: (String -> String) -> T.Text -> T.Text
+t = dimap T.unpack T.pack