work on off-by-one errors

1 files changed, 23 insertions, 8 deletions

diff --git a/countdown.hs b/countdown.hs
index 4d43224..e2a667e 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -81,6 +81,7 @@ data St =
        , _stClockTime      :: LocalTime
        , _stDisplayTime    :: LocalTime
        , _stNextEvent      :: Maybe UTCTime
+       , _stPaused :: Bool
        }
 
 makeLenses ''St
@@ -116,11 +117,18 @@ pluralizeVerb :: Integral i => i -> String
 pluralizeVerb 1 = "s"
 pluralizeVerb _ = ""
 
+truncateTime :: LocalTime -> LocalTime
+truncateTime (LocalTime d (TimeOfDay h m s)) = (LocalTime d (TimeOfDay h m s'))
+  where
+    s' = fromIntegral $ floor s
+
 drawUI :: St -> [Widget ()]
 drawUI st = [a]
   where
-    a = -- (str $ "Last event: " <> (show $ st ^. stLastBrickEvent))
-        -- <=>
+    a = (str $ "Last event: " <> (show $ st ^. stLastBrickEvent))
+        <=>
+        (str "\n")
+        <=>
         (str "\n")
         <=>
         (countdownWidget (isSimulatedTime st) $ st ^. stDisplayTime)
@@ -128,7 +136,7 @@ drawUI st = [a]
 printRemain unit quantity = printf "%d %s%s remain%s"
 
 countdownWidget :: Bool -> LocalTime -> Widget n
-countdownWidget isSimulated t =
+countdownWidget isSimulated (truncateTime -> t) =
   (hCenter (borderWithLabel (str $ printf "Current time%s" (if isSimulated then " (SIMULATED)" else "")) $
             padLeftRight 3 $ (str (formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" t))))
 
@@ -171,16 +179,19 @@ countdownWidget isSimulated t =
                   dayNum
                   numDays
                   currentYear
-                  (commas $ toSeconds yearElapsed)
+                  (commas $ 1 + toSeconds yearElapsed)
                   (commas $ toSeconds yearLength)
                   currentYear))
   where
-    cosmicYearsAgo = (realToFrac ageOfUniverseInYears) * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
+    cosmicYearsAgo = realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
+    -- cosmicYearsAgo = if yearElapsed == yearLength
+    --                  then 0
+    --                  else realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
     currentYear    = yearNumber t
     dayNum         = dayNumOfYear t
     numDays        = daysInYear t
-    yearLength     = fromIntegral numDays * nominalDay
-    -- yearLength  = (zonedTimeToLocalTime $ yearEnd t) `diffLocalTime` (zonedTimeToLocalTime $ yearStart t)
+    -- yearLength     = fromIntegral numDays * nominalDay
+    yearLength     = yearEnd t `diffLocalTime` yearStart t
     yearElapsed    = t `diffLocalTime` (yearStart t)
 
     daysLeft       = numDays - dayNum
@@ -233,11 +244,14 @@ handleEvent chan st e =
         VtyEvent (V.EvKey V.KHome [])        -> cont $ st & stDisplayTime .~ (st ^. stClockTime)
         VtyEvent (V.EvKey V.KHome [MShift])  -> cont $ st & stDisplayTime .~ (newYearsEveNoon $ st ^. stClockTime)
         VtyEvent (V.EvKey V.KHome [MCtrl])   -> cont $ st & stDisplayTime .~ (newYearsEveLast10 $ st ^. stClockTime)
+        VtyEvent (V.EvKey V.KEnd [])         -> cont $ st & stDisplayTime .~ (yearEnd $ st ^. stClockTime)
+        VtyEvent (V.EvKey (V.KChar 'p') [])  -> cont $ st & stPaused %~ not
         VtyEvent _                           -> cont st
         AppEvent (TimeChanged now) -> do
           queueNextEvent chan now
           let oldTime = st ^. stClockTime
-          cont $ st & stClockTime .~ (zonedTimeToLocalTime now) & stDisplayTime %~ (addLocalTime ((zonedTimeToLocalTime now) `diffLocalTime` oldTime))
+          cont $ st & stClockTime .~ (zonedTimeToLocalTime now)
+                    & stDisplayTime %~ if st ^. stPaused then id else (addLocalTime ((zonedTimeToLocalTime now) `diffLocalTime` oldTime))
         _ -> cont st
     where
       cont s = do
@@ -260,6 +274,7 @@ initialState t =
        , _stClockTime = t
        , _stDisplayTime = t
        , _stNextEvent = Nothing
+       , _stPaused = False
        }
 
 daysInYear :: LocalTime -> Int