X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FPicklers.hs;h=3863017c090018268dc67f93c8e34c3583667543;hb=4528edbc14bd229e500f6c85960eb14a951dbfbe;hp=bc13badbd7134691fe6ee4158019f3b926cbc41b;hpb=e53fc614221083bc059a6eebfab91172db0a0723;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs
index bc13bad..3863017 100644
--- a/src/TSN/Picklers.hs
+++ b/src/TSN/Picklers.hs
@@ -2,13 +2,15 @@
 --   feed.
 --
 module TSN.Picklers (
+  xp_ambiguous_time,
   xp_date,
   xp_date_padded,
+  xp_datetime,
   xp_earnings,
   xp_gamedate,
-  xp_racedate,
   xp_tba_time,
   xp_time,
+  xp_time_dots,
   xp_time_stamp )
 where
 
@@ -35,8 +37,9 @@ import TSN.Parse (
 -- | The format string for a base date in m/d/yyyy format. The
 --   day/month are not padded at all. This will match for example,
 --
---   * 2/15/1983
---   * 1/1/0000
+--   * 2\/15\/1983
+--
+--   * 1\/1\/0000
 --
 date_format :: String
 date_format = "%-m/%-d/%Y"
@@ -46,8 +49,9 @@ date_format = "%-m/%-d/%Y"
 --   day/month are padded to two characters with zeros. This will
 --   match for example,
 --
---   * 02/15/1983
---   * 01/01/0000
+--   * 02\/15\/1983
+--
+--   * 01\/01\/0000
 --
 date_format_padded :: String
 date_format_padded = "%0m/%0d/%Y"
@@ -108,9 +112,11 @@ format_commas x =
 -- | Parse \<Earnings\> from an 'AutoRaceResultsListing'. These are
 --   essentially 'Int's, but they look like,
 --
---   * <Earnings>336,826</Earnings>
---   * <Earnings>1,000,191</Earnings>
---   * <Earnings>TBA</Earnings>
+--   * \<Earnings\>336,826\</Earnings\>
+--
+--   * \<Earnings\>1,000,191\</Earnings\>
+--
+--   * \<Earnings\>TBA\</Earnings\>
 --
 xp_earnings :: PU (Maybe Int)
 xp_earnings =
@@ -122,32 +128,33 @@ xp_earnings =
     to_earnings :: String -> Maybe Int
     to_earnings s
       | s == "TBA" = Nothing
-      | otherwise = (read . strip_commas . show) s
+      | otherwise = Just  $ (read . strip_commas) s
 
     from_earnings :: Maybe Int -> String
     from_earnings Nothing = "TBA"
     from_earnings (Just i) = format_commas i
 
 
--- | (Un)pickle a 'UTCTime' from a \<RaceDate\> element in an
---   'AutoRaceResults' message.
+-- | (Un)pickle an unpadded 'UTCTime'. Used for example on the
+--   \<RaceDate\> elements in an 'AutoRaceResults' message.
 --
---   Example:
+--   Examples:
+--
+--   * \<RaceDate\>6/1/2014 1:00:00 PM\</RaceDate\>
 --
---   <RaceDate>6/1/2014 1:00:00 PM</RaceDate>
---   <RaceDate>5/24/2014 2:45:00 PM</RaceDate>
+--   * \<RaceDate\>5/24/2014 2:45:00 PM\</RaceDate\>
 --
-xp_racedate :: PU UTCTime
-xp_racedate =
-  (to_racedate, from_racedate) `xpWrapMaybe` xpText
+xp_datetime :: PU UTCTime
+xp_datetime =
+  (to_datetime, from_datetime) `xpWrapMaybe` xpText
   where
     format = date_format ++ " " ++ "%-I:%M:%S %p"
 
-    to_racedate :: String -> Maybe UTCTime
-    to_racedate = parseTime defaultTimeLocale format
+    to_datetime :: String -> Maybe UTCTime
+    to_datetime = parseTime defaultTimeLocale format
 
-    from_racedate :: UTCTime -> String
-    from_racedate = formatTime defaultTimeLocale format
+    from_datetime :: UTCTime -> String
+    from_datetime = formatTime defaultTimeLocale format
 
 
 -- | (Un)pickle a UTCTime from a weather forecast's gamedate. Example
@@ -214,6 +221,32 @@ xp_time =
     from_time = formatTime defaultTimeLocale time_format
 
 
+-- | (Un)pickle a UTCTime without the date portion. This differs from
+--   'xp_time' in that it uses periods in the AM/PM part, i.e. \"A.M.\"
+--   and \"P.M.\" It also doesn't use padding for the \"hours\" part.
+--
+--   Examples:
+--
+--   * \<CurrentTimeStamp\>11:30 A.M.\</CurrentTimeStamp\>
+--
+xp_time_dots :: PU UTCTime
+xp_time_dots =
+  (to_time, from_time) `xpWrapMaybe` xpText
+  where
+    -- | The hours arent padded with zeros.
+    nopad_time_format :: String
+    nopad_time_format = "%-I:%M %p"
+
+    to_time :: String -> Maybe UTCTime
+    to_time = (parseTime defaultTimeLocale nopad_time_format) . (replace "." "")
+
+    from_time :: UTCTime -> String
+    from_time t =
+        replace "AM" "A.M." (replace "PM" "P.M." s)
+      where
+        s = formatTime defaultTimeLocale nopad_time_format t
+
+
 -- | (Un)pickle a UTCTime without the date portion, allowing for a
 --   value of \"TBA\" (which gets translated to 'Nothing').
 --
@@ -253,3 +286,23 @@ xp_time_stamp =
     from_time_stamp :: UTCTime -> String
     from_time_stamp =
       formatTime defaultTimeLocale time_stamp_format . subtract_five
+
+
+-- | (Un)pickle an ambiguous 12-hour AM/PM time, which is ambiguous
+--   because it's missing the AM/PM part.
+--
+--   Examples:
+--
+xp_ambiguous_time :: PU UTCTime
+xp_ambiguous_time =
+  (to_time, from_time) `xpWrapMaybe` xpText
+  where
+    ambiguous_time_format :: String
+    ambiguous_time_format = "%-I:%M"
+
+    to_time :: String -> Maybe UTCTime
+    to_time = parseTime defaultTimeLocale ambiguous_time_format
+
+    from_time :: UTCTime -> String
+    from_time =
+      formatTime defaultTimeLocale ambiguous_time_format