Introduce handy fail(Error|Fatal) shorthand

libro-app · Aug 14, 2024 · 2af3046 · 2af3046
1 parent d5796a6
commit 2af3046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/LiBro/Base.hs b/lib/LiBro/Base.hs
@@ -21,7 +21,10 @@ class (Monad m, MonadFail m) => MonadLiBro m where
   logWarning  = addLog WARNING
   logError    = addLog ERROR
   logFatal    = addLog FATAL
-  addLog    :: LogLevel -> LogSource -> LogMessage -> m ()
+  addLog :: LogLevel -> LogSource -> LogMessage -> m ()
+  failError, failFatal :: LogSource -> LogMessage -> m a
+  failError s m = logError s m >> fail m
+  failFatal s m = logFatal s m >> fail m
 
   doesFileExist :: FilePath -> m Bool
 

diff --git a/lib/LiBro/Data/Storage.hs b/lib/LiBro/Data/Storage.hs
@@ -115,9 +115,7 @@ loadPersons = do
       mprs <- loadFromXlsx fp
       case mprs of
         Right prs -> return $ personMap prs
-        Left e    -> do
-          logError "XLSX persons loader" e
-          fail e
+        Left e    -> failFatal "XLSX persons loader" e
 
 -- |  Store 'Tasks' at the configured storage space.
 storeTasks :: MonadLiBro m => Tasks -> m ()
@@ -139,9 +137,7 @@ loadTasks pmap = do
       mrecords <- loadFromXlsx fp
       case mrecords of
         Right records -> return $ taskRecordsToTasks pmap records
-        Left e        -> do
-          logError "XLSX tasks loader" e
-          fail e
+        Left e        -> failFatal "XLSX tasks loader" e
 
 -- |  Store a complete dataset at the configured file system
 --    locations.