tweak output

1 files changed, 63 insertions, 35 deletions

diff --git a/countdown.hs b/countdown.hs
index a446555..7f54920 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -188,36 +188,12 @@ showLarge n                                = printf "%.3f" n
 
 countdownWidget :: Bool -> LocalTime -> Widget n
 countdownWidget isSimulated 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))))
-
-  <=>
   (border $ vBox [
     (hCenter $ hBox
-     [ (borderWithLabel (str $ printf "Countdown %d" currentYear)
-         (str $ printf "%d day%s remain%s\n%s hour%s remain%s\n%s minute%s remain%s\n%s second%s remain%s"
-                        daysLeft
-                        (pluralize daysLeft)
-                        (pluralizeVerb daysLeft)
-                        (commasF 2 hoursLeft)
-                        (pluralize $ (floor hoursLeft :: Integer))
-                        (pluralizeVerb $ (floor hoursLeft :: Integer))
-                        (commasF 2 minutesLeft)
-                        (pluralize $ (floor minutesLeft :: Integer))
-                        (pluralizeVerb $ (floor minutesLeft :: Integer))
-                        (commasF' 1 secondsLeft)
-                        (pluralize secondsLeft)
-                        (pluralizeVerb secondsLeft)))
-     , (borderWithLabel (str "Cosmic Time") $
-       vBox [ (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
-            , (str "\n\n")
-            , (str $ printf "%s years ago" (showLarge $ (realToFrac cosmicYearsAgo)))
-            -- , (str $ printf "%s billion years ago" (commasF 9 $ cosmicYearsAgo / (1000*1000*1000)))
-            -- , (str $ printf "%s million years ago" (commasF 6 $ cosmicYearsAgo / (1000*1000)))
-            -- , (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
-            -- , (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer)))
-            ])
-    ])
+     [ countdownBox
+     , currentTimeBox
+     , cosmicTimeBox
+     ])
     ,
     str "\n"
     ,
@@ -231,18 +207,70 @@ countdownWidget isSimulated t =
     str "\n"
     <=>
     hCenter (hBox [
-      borderWithLabel (str $ printf "Progress through %d" currentYear) $
-        (str $ printf "Day %d of %d\nSecond %s of %s"
-              dayNum
-              numDays
-              (commas $ (1 + toSeconds yearElapsed :: Int))
-              (commas $ toSeconds yearLength))
-      ,
+      -- borderWithLabel (str $ printf "Progress through %d" currentYear) $
+      --   (str $ printf "Day %d of %d; %d remaining\nSecond %s of %s"
+      --         dayNum
+      --         numDays
+      --         (numDays - dayNum)
+      --         (commas $ (1 + toSeconds yearElapsed :: Int))
+      --         (commas $ toSeconds yearLength))
+      -- ,
       str "   "
       ,
       borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
     ])
   where
+    countdownBox =
+      (borderWithLabel (str $ printf "Countdown %d" currentYear) $
+         (str $ printf "Day %d of %d; %d remaining\nSecond %s of %s"
+               dayNum
+               numDays
+               daysLeft
+               (commas $ (1 + toSeconds yearElapsed :: Int))
+               (commas $ toSeconds yearLength))
+         <=>
+         -- (str $ printf "%d day%s remain%s"
+         --                daysLeft
+         --                (pluralize daysLeft)
+         --                (pluralizeVerb daysLeft)
+         -- )
+         -- <=>
+         (str $ if hoursLeft < 24 && hoursLeft > 1
+           then
+             printf "%s hour%s remain%s"
+             (commasF 2 hoursLeft)
+             (pluralize $ (floor hoursLeft :: Integer))
+             (pluralizeVerb $ (floor hoursLeft :: Integer))
+           else "")
+         <=>
+         (str $ if hoursLeft <= 1 && minutesLeft > 1
+           then
+             printf "%s minute%s remain%s"
+             (commasF 2 minutesLeft)
+             (pluralize $ (floor minutesLeft :: Integer))
+             (pluralizeVerb $ (floor minutesLeft :: Integer))
+           else "")
+         <=>
+         (str $ if minutesLeft <= 1
+           then
+             printf "%s second%s remain%s"
+             (commasF' 1 secondsLeft)
+             (pluralize secondsLeft)
+             (pluralizeVerb secondsLeft)
+           else ""))
+
+    cosmicTimeBox =
+      (borderWithLabel (str "Cosmic Time") $
+       vBox [ (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
+            , (str "\n")
+            , (str $ printf "%s years ago" (showLarge $ (realToFrac cosmicYearsAgo)))
+            -- , (str $ printf "%s billion years ago" (commasF 9 $ cosmicYearsAgo / (1000*1000*1000)))
+            -- , (str $ printf "%s million years ago" (commasF 6 $ cosmicYearsAgo / (1000*1000)))
+            -- , (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
+            -- , (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer)))
+            ])
+    currentTimeBox = (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))))
     cosmicYearsAgo = realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
     -- cosmicYearsAgo = if yearElapsed == yearLength
     --                  then 0