Cleaner code ;P

dtekcth · Jun 5, 2024 · 1a320f2 · 1a320f2
1 parent 3c5785f
commit 1a320f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/mat-chalmers.cabal b/mat-chalmers.cabal
@@ -54,6 +54,7 @@ library
                , thyme >= 0.4 && <= 0.5
                , word8 == 0.1.3
                , extra >= 1.7.10 && <= 1.8
+               , vector-space >= 0.16 && <0.18
 
 executable mat-chalmers
   main-is: Main.hs

diff --git a/src/Model.hs b/src/Model.hs
@@ -37,12 +37,12 @@ import           Data.Text.Lazy                           ( fromStrict
 import           Prettyprinter                            ( Doc
                                                           , pretty
                                                           )
+import           Data.AffineSpace                         ( (.+^) )
 import           Data.Thyme                               ( _localDay
                                                           , _localTimeOfDay
                                                           , _todHour
                                                           , _zonedTimeToLocalTime
                                                           , getZonedTime
-                                                          , gregorian
                                                           )
 import           Lens.Micro.Platform                      ( (^.)
                                                           , (&)
@@ -56,7 +56,6 @@ import           Model.Types
 import           Model.Karen
 import           Model.Wijkanders
 import           Model.Linsen
-import           Util                                     ( nextDay )
 
 -- | Refreshes menus.
 -- The refresh function evaluates to `Some monad m => m (View model, Update signal)`,
@@ -94,7 +93,7 @@ update = do
   let (textday, d) =
         if dateNow ^. _localTimeOfDay . _todHour >= nextDayHour
           then
-            ("Tomorrow", dateNow & (_localDay . gregorian) %~ nextDay)
+            ("Tomorrow", dateNow & _localDay %~ (.+^ 1))
           else ("Today", dateNow)
   let day'    = d ^. _localDay
   let karenR  = fetchAndCreateRestaurant day'

diff --git a/src/Util.hs b/src/Util.hs
@@ -5,7 +5,6 @@ module Util where
 import           Data.ByteString.Lazy                     ( ByteString )
 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Word8                    as W8
-import           Data.Thyme.Calendar
 
 import           Text.HTML.TagSoup                        ( Tag
                                                           , isTagText
@@ -30,12 +29,3 @@ removeWhitespaceTags :: [Tag ByteString] -> [Tag ByteString]
 removeWhitespaceTags =
   filter (\t -> not (isTagText t) || tagText (not . BL.all W8.isSpace) t)
 
--- |  Increase the date by one with and handles overflow
---    I cannot believe that this isn't in the library
-nextDay :: YearMonthDay -> YearMonthDay
-nextDay (YearMonthDay y m d)
-  | d < len   = YearMonthDay  y       m      (d + 1)
-  | m < 12    = YearMonthDay  y      (m + 1)  1
-  | otherwise = YearMonthDay (y + 1)  1       1
-  where
-      len = gregorianMonthLength y m