large number formatting

2 files changed, 14 insertions, 2 deletions

diff --git a/countdown.hs b/countdown.hs
index 3f39a7d..b53a3a4 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -22,6 +22,7 @@ import Control.Monad.RWS
 import Data.Time.Calendar.OrdinalDate
 import Data.Text.Format.Numbers
 
+import Data.Text (unpack)
 import Control.Lens
 import Control.Monad (void, forever)
 import Control.Concurrent (threadDelay, forkIO)
@@ -172,6 +173,15 @@ cosmicConversion = borderWithLabel (str "Cosmic Conversion") $ renderTable $
     [str "100 years"          , showCosmicYears 100]
   ]
 
+showLarge :: Double -> String
+showLarge n | n >= 10 * 1000 * 1000 * 1000 = printf "%.0f billion"  (n / (1000 * 1000 * 1000))
+showLarge n | n >= 1000 * 1000 * 1000      = printf "%.1f billion"  (n / (1000 * 1000 * 1000))
+showLarge n | n >= 10 * 1000 * 1000        = printf "%.0f million"  (n / (1000 * 1000))
+showLarge n | n >= 1000 * 1000             = printf "%.1f million"  (n / (1000 * 1000))
+showLarge n | n >= 10 * 1000               = printf "%.0f thousand" (n / 1000)
+showLarge n | n >= 10                      = unpack $ commasF 0 n
+showLarge n                                = printf "%.3f" n
+
 countdownWidget :: Bool -> LocalTime -> Widget n
 countdownWidget isSimulated (truncateTime -> t) =
   (hCenter (borderWithLabel (str $ printf "Current time%s" (if isSimulated then " (SIMULATED)" else "")) $
@@ -194,13 +204,14 @@ countdownWidget isSimulated (truncateTime -> t) =
                         (commas secondsLeft)
                         (pluralize secondsLeft)
                         (pluralizeVerb secondsLeft)))
-     , (borderWithLabel (str "Cosmic Countdown") $
+     , (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)))
+            -- , (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer)))
             ])
     ])
     ,
diff --git a/package.yaml b/package.yaml
index fa26a44..d081cde 100644
--- a/package.yaml
+++ b/package.yaml
@@ -12,6 +12,7 @@ dependencies:
 - containers
 - brick
 - format-numbers
+- text
 
 executables:
   countdown: