some minor code cleanup

This commit is contained in:
Dennis Frieberg 2025-06-06 19:04:57 +02:00
parent 5c203e5a95
commit 72e53eea4f
Signed by: nerf
GPG key ID: 7C58AFED036072C5
3 changed files with 17 additions and 8 deletions

View file

@ -37,20 +37,17 @@ findChoirDay today table = maybe
main' :: App ()
main' = do
args <- liftIO getArgs
case L.uncons args of
Nothing -> fail "We need exactly one config path as option"
Just (headArgs,_) -> do
case args of
[] -> fail "Please provide a config file"
(headArgs : _) -> do
config <- parseConfigFile headArgs
-- we want to handle these while we have the config in scope
result <- liftIO $ runApp $ do
handleE (\error' -> reportErrorMail config error') $ do
bs <- request
table <- except $ parseBString bs
today <- liftIO getToday
record <- except $ findChoirDay today table
send (mailDomain config) (mailUsername config) (mailPassword config) (mailTo config) (mailFrom config) (mailSubject record) (mailText record)
case result of
Right x -> return x
Left error' -> reportErrorMail config error'

View file

@ -3,6 +3,8 @@ module Monad(
App
,module Control.Monad.Fail
,module Control.Monad.IO.Class
,handleE
,catchE
,throwE
,except
,runApp
@ -29,6 +31,16 @@ instance MonadFail App where
throwE :: String -> App a
throwE = App . T.throwE
catchE :: App a -> (String -> App a) -> App a
catchE a f = do
result <- liftIO $ runApp a
case result of
Left err -> f err
Right res -> return res
handleE :: (String -> App a) -> App a -> App a
handleE = flip catchE
except :: Either String a -> App a
except = App . T.except

View file

@ -62,7 +62,7 @@
});
in
pkgs.kakoune.override {
plugins = with pkgs.kakounePlugins; [fzf-kak kak-lsp config];
plugins = with pkgs.kakounePlugins; [fzf-kak kakoune-lsp config];
};
in
pkgs.mkShell {