commit 180d8533e6790f3fbe0cbda379b89da051343af9
author Matthias Andreas Benkard <code@mail.matthias.benkard.de> Mon May 25 17:47:00 2026 +0200
committer Matthias Andreas Benkard <code@mail.matthias.benkard.de> Mon May 25 17:47:00 2026 +0200
tree c3a1c9fcc7b34e2c0341e586e110f5c8ec1bb8d4
parent b06f591c8d7b2c8d2c2eb245551b30ad89f7da37

Add an optional verbose flag to the Dhall configuration.

It is OR'd with the --verbose CLI flag. Defaults to False
when omitted, via record merge with a defaults record in
readConfig.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Change-Id: Ic3d3ef408e97a2b083c910eee685e57043ee6f7e

config.example.dhall

diff --git a/config.example.dhall b/config.example.dhall
index 42451ac..c3b0476 100644
--- a/config.example.dhall
+++ b/config.example.dhall
@@ -1,6 +1,7 @@
 let home = "/Users/mulk" in
 
 { host = "mulkinator"
+, verbose = False
 , stashes =
     [ { name = "mulk.tar"
       , baseDir = home

src/Mulkup/Config.hs

diff --git a/src/Mulkup/Config.hs b/src/Mulkup/Config.hs
index 8356824..b1db1a9 100644
--- a/src/Mulkup/Config.hs
+++ b/src/Mulkup/Config.hs
@@ -33,7 +33,7 @@
 
 --- MulkupConfig ---
 
-data MulkupConfig = MulkupConfig {host :: Text, stashes :: [StashConfig]}
+data MulkupConfig = MulkupConfig {host :: Text, stashes :: [StashConfig], verbose :: Bool}
   deriving stock (Generic, Show)
   deriving anyclass (FromDhall)
 
@@ -41,5 +41,7 @@
 
 --- readConfig ---
 
+-- | Reads a Dhall config, merging the user's record over a defaults
+-- record so optional fields can be omitted entirely.
 readConfig :: Text -> IO MulkupConfig
-readConfig = Dhall.input auto
+readConfig text = Dhall.input auto ("{ verbose = False } // (" <> text <> ")")

src/Mulkup/Main.hs

diff --git a/src/Mulkup/Main.hs b/src/Mulkup/Main.hs
index 32c63ea..84aff6a 100644
--- a/src/Mulkup/Main.hs
+++ b/src/Mulkup/Main.hs
@@ -27,19 +27,20 @@
 main :: IO ()
 main = do
   flags <- execParser $ info (flagParser <**> helper) fullDesc
+  config <- readConfig "./config.dhall"
+
+  let effectiveFlags = flags & #verbose %~ (|| config ^. #verbose)
   let messageAction =
-        if verbose flags
+        if effectiveFlags ^. #verbose
           then richMessageAction
           else simpleMessageAction
 
-  config <- readConfig "./config.dhall"
-
   result <-
     main'
       & runBupstash
       & runLogAction @IO messageAction
       & runReader (config :: MulkupConfig)
-      & runReader flags
+      & runReader effectiveFlags
       & errorToIOFinal @Text
       & embedToFinal @IO
       & runFinal @IO

test/Mulkup/ConfigSpec.hs

diff --git a/test/Mulkup/ConfigSpec.hs b/test/Mulkup/ConfigSpec.hs
index 142d130..42d9d5f 100644
--- a/test/Mulkup/ConfigSpec.hs
+++ b/test/Mulkup/ConfigSpec.hs
@@ -11,7 +11,7 @@
 cases =
   testGroup
     "ConfigSpec"
-    [unit_simpleConfig]
+    [unit_simpleConfig, unit_verboseOmitted]
 
 unit_simpleConfig :: TestTree
 unit_simpleConfig = testCase "unit_simpleConfig" $ do
@@ -21,6 +21,8 @@
       "\
       \{ host = \"atmon\" \
       \ \
+      \, verbose = False \
+      \ \
       \, stashes = \
       \    [ { name = \"mulk\" \
       \       \
@@ -46,3 +48,26 @@
       \      } \
       \    ] \
       \}"
+
+unit_verboseOmitted :: TestTree
+unit_verboseOmitted = testCase "unit_verboseOmitted" $ do
+  config <- readConfig exampleConfigText
+  verbose config @?= False
+  where
+    exampleConfigText =
+      "\
+      \{ host = \"atmon\" \
+      \ \
+      \, stashes = \
+      \    [ { name = \"mulk\" \
+      \      , baseDir = \"/Users/mulk\" \
+      \      , tiers = \
+      \          { hourly  = { keep = 1 } \
+      \          , daily   = { keep = 1 } \
+      \          , weekly  = { keep = 1 } \
+      \          , monthly = { keep = 1 } \
+      \          } \
+      \      , exclusions = [] : List Text \
+      \      } \
+      \    ] \
+      \}"