imp: config file: also try home and XDG config dirs

hledger.conf.sample

@@ -1,5 +1,7 @@
 # hledger.conf - extra options(/arguments) to be added to hledger commands.
-# This takes effect if found in the current directory when you run hledger.
+# hledger looks for this in the current directory (./hledger.conf)
+# or in your home directory with a dotted name    ($HOME/.hledger.conf)
+# or in your XDG config directory for hledger     ($HOME/.config/hledger/hledger.conf).
 
 # 1. This first, unnamed section is typically used for general options.
 # These affect all commands, or when not supported will be ignored.

hledger/Hledger/Cli/Conf.hs

@@ -4,6 +4,7 @@ Read extra CLI arguments from a hledger config file.
 
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE TupleSections #-}
 
 module Hledger.Cli.Conf (
    getConf
@@ -11,23 +12,23 @@ module Hledger.Cli.Conf (
 )
 where
 
-import Control.Exception (IOException, catch, tryJust)
+import Control.Monad (void)
-import Control.Monad (guard, void)
 import Control.Monad.Identity (Identity)
+import Data.Functor ((<&>))
 import qualified Data.Map as M
 import Data.Text (Text)
 import qualified Data.Text as T (pack)
-import System.IO.Error (isDoesNotExistError)
+import System.Directory (getHomeDirectory, getXdgDirectory, XdgDirectory (XdgConfig), doesFileExist)
-import Text.Megaparsec -- hiding (parse)
+import System.FilePath ((</>))
+import Text.Megaparsec
 import Text.Megaparsec.Char
 
 import Hledger (error', strip, words')
 import Hledger.Read.Common
 import Hledger.Utils.Parse
+import Hledger.Utils.Debug
 
 
-localConfPath = "hledger.conf"
-
 -- | A hledger config file.
 data Conf = Conf {
    confFile :: FilePath
@@ -67,16 +68,24 @@ confLookup cmd Conf{confSections} =
   M.lookup cmd $
   M.fromList [(csName,csArgs) | ConfSection{csName,csArgs} <- confSections]
 
--- | Try to read a hledger config file.
+-- | Try to read a hledger config file from several places.
--- If none is found, this returns a null Conf.
+-- If no config file is found, this returns a null Conf.
--- Any other IO error will cause an exit.
+-- Any other IO or parse failure will raise an error.
 getConf :: IO Conf
-getConf = (do
+getConf = do
-  let f = localConfPath
+  homedir      <- getHomeDirectory
-  es <- tryJust (guard . isDoesNotExistError) $ readFile f
+  xdgconfigdir <- getXdgDirectory XdgConfig "hledger"
-  case es of
+  let
-    Left _ -> return nullconf
+    localconf = "./hledger.conf"
-    Right s ->
+    homeconf  = homedir </> ".hledger.conf"
+    xdgconf   = xdgconfigdir </> "hledger.conf"
+    dd = (dbg1With (("config file: "<>).fst) <$>)
+  mlocalconf <- readConfFile localconf
+  mhomeconf  <- readConfFile homeconf
+  mxdgconf   <- readConfFile xdgconf
+  case dd mlocalconf <|> dd mhomeconf <|> dd mxdgconf of
+    Nothing -> return $ traceAt 1 "no config file found" $ nullconf
+    Just (f,s) ->
       case parseConf f (T.pack s) of
         Left err -> error' $ errorBundlePretty err -- customErrorBundlePretty err
         Right ss -> return nullconf{
@@ -85,7 +94,13 @@ getConf = (do
           ,confFormat   = 1
           ,confSections = ss
           }
-  ) `catch` \(e :: IOException) -> error' $ show e
+
+-- | If the specified file exists, read it and return the contents and the path;
+-- if not, return Nothing. If there's any other IO error, exit the program.
+readConfFile :: FilePath -> IO (Maybe (FilePath, String))
+readConfFile f = do
+  exists <- doesFileExist f
+  if exists then readFile f <&> (Just.(f,)) else return Nothing
 
 -- config file parsing