Add the format_commas function and use it to implement the earnings pickler.

Doctest TSN.Picklers.

diff --git a/htsn-import.cabal b/htsn-import.cabal
index b5b151725fe34f315b15595891c86827f2d3be1a..57b00c8d771d9aca783432a97dc998cfb93e9423 100644 (file)
--- a/htsn-import.cabal
+++ b/htsn-import.cabal
@@ -87,6 +87,7 @@ executable htsn-import
     groundhog-th                >= 0.5,
     MissingH                    >= 1.2,
     old-locale                  >= 1,
+    split                       >= 0.2,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8,
     time                        >= 1.4,
@@ -168,6 +169,7 @@ test-suite testsuite
     groundhog-th                >= 0.5,
     MissingH                    >= 1.2,
     old-locale                  >= 1,
+    split                       >= 0.2,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8,
     time                        >= 1.4,
@@ -239,6 +241,7 @@ test-suite shelltests
     groundhog-th                >= 0.5,
     MissingH                    >= 1.2,
     old-locale                  >= 1,
+    split                       >= 0.2,
     process                     >= 1.1,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8,

diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs
index 387f4cf4fe4926d0c436678ca0e2ed509b075049..ff7b0d1e677e9cff2c9cd469c77e226be272a2a6 100644 (file)
--- a/src/TSN/Picklers.hs
+++ b/src/TSN/Picklers.hs
@@ -13,6 +13,8 @@ module TSN.Picklers (
 where
 
 -- System imports.
+import Data.List ( intercalate )
+import Data.List.Split ( chunksOf )
 import Data.String.Utils ( replace )
 import Data.Time.Clock ( NominalDiffTime, UTCTime, addUTCTime )
 import Data.Time.Format ( formatTime, parseTime )
@@ -78,6 +80,31 @@ xp_date_padded =
     from_date = formatTime defaultTimeLocale date_format_padded
 
 
+
+-- | Format a number as a string using a comma as the thousands
+--   separator.
+--
+--   Examples:
+--
+--   >>> format_commas 0
+--   "0"
+--   >>> format_commas 10
+--   "10"
+--   >>> format_commas 100
+--   "100"
+--   >>> format_commas 1000
+--   "1,000"
+--   >>> format_commas 10000
+--   "10,000"
+--   >>> format_commas 100000
+--   "100,000"
+--   >>> format_commas 1000000
+--   "1,000,000"
+--
+format_commas :: Int -> String
+format_commas x =
+  reverse (intercalate "," $ chunksOf 3 $ reverse $ show x)
+
 -- | Parse \<Earnings\> from an 'AutoRaceResultsListing'. These are
 --   essentially 'Int's, but they look like,
 --
@@ -98,8 +125,8 @@ xp_earnings =
       | otherwise = (read . strip_commas . show) s
 
     from_earnings :: Maybe Int -> String
-    from_earnings Nothing = ""
-    from_earnings (Just i) = show i
+    from_earnings Nothing = "TBA"
+    from_earnings (Just i) = format_commas i
 
 
 -- | (Un)pickle a 'UTCTime' from a \<RaceDate\> element in an

diff --git a/test/Doctests.hs b/test/Doctests.hs
index d76d27217423e93bdb07b5571f532aef10f4f4f1..af4bcb5085a7c5650db14a0c9bfc6434e1e3630e 100644 (file)
--- a/test/Doctests.hs
+++ b/test/Doctests.hs
@@ -4,9 +4,10 @@ import Test.DocTest ( doctest )
 
 -- | There's some kind of goddamned bug causing the doctests to commit
 --   suicide when run on src/Main.hs. Since we only have doctests in
---   TSN.Codegen for now, just test that.
+--   TSN.Codegen and TSN.Picklers for now, just test those.
 --
 main :: IO ()
 main = doctest [ "-isrc",
                  "-idist/build/autogen",
-                 "src/TSN/Codegen.hs" ]
+                 "src/TSN/Codegen.hs",
+                 "src/TSN/Picklers.hs"]