nerf/choirMail
1
0
Fork 0
mirror of https://git.nerfingen.de/nerf/choirMail.git synced 2025-05-15 01:40:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed for new ghc version

Browse source
This commit is contained in:
Dennis Frieberg 2025-05-10 13:36:56 +02:00
parent 6ab55f82a6
commit f88fcc1391
Signed by: nerf
GPG key ID: 7C58AFED036072C5
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/Main.hs
View file

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

1
app/Requester.hs
View file

@ -5,7 +5,6 @@ import Network.HTTP.Req
-- import qualified Data.Text as T -- import qualified Data.Text as T
import Control.Monad.IO.Class(MonadIO) import Control.Monad.IO.Class(MonadIO)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Text.URI
url :: Url 'Https url :: Url 'Https
url = https "md.darmstadt.ccc.de" /: "mathechor-probenplanung" /: "download" url = https "md.darmstadt.ccc.de" /: "mathechor-probenplanung" /: "download"

2
choirMail.cabal
View file

@ -76,7 +76,7 @@ executable choirMail
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
-- ^>=4.15.1.0 -- ^>=4.15.1.0
build-depends: base >=4.15.1.0 && < 4.19 build-depends: base >=4.15.1.0 && < 4.21
,transformers ,transformers
,tomland >= 1.3.3.0 ,tomland >= 1.3.3.0
,smtp-mail ,smtp-mail

12
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1731533236,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712192574, "lastModified": 1746576598,
"narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=", "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f480f9d09e4b4cf87ee6151eba068197125714de", "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55",
"type": "github" "type": "github"
}, },
"original": { "original": {