First attempt at logging to files instead of std out

.gitignore

@@ -17,3 +17,4 @@ cabal.sandbox.config
 .envrc
 dist-newstyle/
 result/
+logs/

app/Main.hs

@@ -37,6 +37,7 @@ import           System.Console.GetOpt                    ( ArgDescr(..)
                                                           , getOpt
                                                           , usageInfo
                                                           )
+import           System.Directory                         ( createDirectoryIfMissing )
 import           System.Environment                       ( getArgs )
 import           System.IO                                ( stdout )
 import           Web.Scotty                               ( get
@@ -54,6 +55,7 @@ opts :: [OptDescr (Config -> Config)]
 opts =
   [ Option [] ["help"] (NoArg (set cHelp True))           "Show usage info"
   , Option [] ["port"] (ReqArg (set cPort . read) "PORT") "Port to run on"
+  , Option [] ["path"] (ReqArg (set cLogPath) "PATH")     "Path to save log files to, default is 'logs'"
   , Option []
            ["interval"]
            (ReqArg (set cInterval . (1000000 *) . read) "INTERVAL (s)")
@@ -71,6 +73,7 @@ main = (recreateConfig . getOpt Permute opts <$> getArgs) >>= \case
   (config                  , _    , _    ) -> do
     upd     <- newEmptyMVar -- putMVar when to update
     viewRef <- createViewReference
+    createDirectoryIfMissing True (_cLogPath config)
 
     -- In the list there are three items running concurrently:
     -- 1. Timer that sends a signal to the updater when it's time to update

mat-chalmers.cabal

@@ -74,6 +74,7 @@ executable mat-chalmers
                , time >= 1.12.2 && < 1.13
                , wai-extra >= 3.1.14 && < 4.0
                , wai-middleware-static-embedded == 0.1.0.0
+               , directory  >= 1.3.5.0 && < 1.4
                , async >= 2.2.5 && <= 3.0
   default-language: GHC2021
 

src/Config.hs

@@ -13,13 +13,14 @@ data Config = Config
   , _cNextDayHour :: !Int
   , _cInterval    :: !Int
   , _cPort        :: !Int
+  , _cLogPath     :: !String
   }
   deriving (Eq, Show)
 
 makeLenses ''Config
 
 defaultConfig :: Config
-defaultConfig = Config False 14 (1000000 * 60 * 30) 5007
+defaultConfig = Config False 14 (1000000 * 60 * 30) 5007 "logs"
 
 -- | Create a Config we can touch
 --

src/Model.hs

@@ -31,24 +31,22 @@ import           Data.IORef                               ( IORef
                                                           , writeIORef
                                                           )
 import           Data.Foldable                            ( for_ )
-import           Data.Text.Lazy                           ( fromStrict
-                                                          , pack
-                                                          )
-import           Prettyprinter                            ( Doc
-                                                          , pretty
-                                                          )
+import           Data.Text.Lazy                           ( fromStrict )
+import           Prettyprinter                            ( Doc )
 import           Data.AffineSpace                         ( (.+^) )
 import           Data.Thyme                               ( _localDay
                                                           , _localTimeOfDay
                                                           , _todHour
                                                           , _zonedTimeToLocalTime
                                                           , getZonedTime
+                                                          , getCurrentTime
                                                           )
 import           Lens.Micro.Platform                      ( (^.)
                                                           , (&)
                                                           , (%~)
                                                           , view
                                                           )
+import           Text.Printf                              ( printf )
 import           Network.HTTP.Req
 
 import           Config
@@ -112,7 +110,9 @@ update = do
 
   for_ rest $ \r -> case menu r of
     Left e ->
-      logMessage =<< timestamp (pretty $ name r <> ": " <> pack (show e))
+      asks _cLogPath >>= \path ->
+      liftIO getCurrentTime >>=
+      liftIO . flip writeFile (show e) . flip (printf "%s/%s%s.txt" path) (name r) . show
     Right _ -> pure ()
 
   return (View rest textday d)

src/Model/Linsen.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts, OverloadedStrings, LambdaCase #-}
+{-# LANGUAGE FlexibleContexts, LambdaCase, MultiWayIf, OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 
 module Model.Linsen
@@ -117,12 +117,11 @@ parse day =
                           []    -> fail "Failed to index into richtext"
                           (v:_) -> pure v)
                   >=> (.: "text")
-                  >=> \s -> if
-                      pure day ==
-                        parseTime swedishTimeLocale "%A %d-%m-%Y" s &&
-                      length v' >= 9
-                               then pure v'
-                               else pure mempty))
+                  >=> \s ->
+                    let sameDay = pure day == parseTime swedishTimeLocale "%A %d-%m-%Y" s
+                     in if | sameDay && length v' >= 9 -> pure v'
+                           | sameDay                   -> pure mempty
+                           | otherwise                 -> fail "Unable to parse day"))
           >=> menuParser
         )
       )

test/Main.hs

@@ -8,7 +8,7 @@ import           Data.Thyme.Time.Core                     ( fromGregorian )
 import           Model.Karen                              ( parse )
 import qualified Model.Linsen                  as L       ( parse )
 import           Model.Types                              ( Menu(..)
-                                                          , NoMenu( NoLunch )
+                                                          , NoMenu( NoLunch, NMParseError )
                                                           )
 import           Model.Wijkanders                         ( getWijkanders
                                                           , hasDate
@@ -27,6 +27,10 @@ testFun = \case
       either
       (assertFailure . mappend "This is not expected, input was:\n" . show)
       (@?= e)
+    Left (NMParseError e _) ->
+      either
+      ((@?= e) . \(NMParseError e1 _) -> e1)
+      (assertFailure . mappend "This is not expected, input was:\n" . show)
     Left e ->
       either
       (@?= e)
@@ -101,7 +105,7 @@ main = hspec $ do
     "parses a blob of JSON without error, that has no lunch"
     (do
       s2 <- BL.readFile "test/linsen2.json" -- Test that has no lunch
-      testFun (Left NoLunch)
+      testFun (Left (NMParseError "Error in $: Unable to parse day" undefined))
         (L.parse
               (fromGregorian 2024 06 06)
               (fromJust $ decode s2))
@@ -112,7 +116,7 @@ main = hspec $ do
     "parses a blob of JSON without error, that has the wrong week"
     (do
       s3 <- BL.readFile "test/linsen3.json"
-      testFun (Left NoLunch)
+      testFun (Left (NMParseError "Error in $: Unable to parse day" undefined))
         (L.parse
               (fromGregorian 2024 06 26)
               (fromJust $ decode s3))