X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FPicklers.hs;h=d87139b793bbb6dddc2e429a0c14b56fb96f3ccc;hb=df558b9603fa5156cf64de856f0be89f396c6deb;hp=16a25ef2f6043811fa9c299daad8132b51dbf81a;hpb=79cba02a6f520256991b345e9dffdaedf68ddde0;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs
index 16a25ef..d87139b 100644
--- a/src/TSN/Picklers.hs
+++ b/src/TSN/Picklers.hs
@@ -3,14 +3,14 @@
 --
 module TSN.Picklers (
   xp_date,
-  xp_team_id )
+  xp_team_id,
+  xp_time )
 where
 
+-- System imports.
 import Data.Time.Clock ( UTCTime )
 import Data.Time.Format ( formatTime, parseTime )
 import System.Locale ( defaultTimeLocale )
-import Text.Printf ( printf )
-import Text.Read ( readMaybe )
 import Text.XML.HXT.Arrow.Pickle (
   xpText,
   xpWrapMaybe )
@@ -32,21 +32,35 @@ xp_date =
     from_date = formatTime defaultTimeLocale format
 
 
--- | Parse a team_id. This *should* just be an 'Int', but TSN is doing
---   something weird. First of all, player IDs do look like normal
---   'Int's. But the team IDs are all stuck in the triple digits, and
---   double-digit team IDs appear to be padded to three characters
---   with a leading '0'. So maybe they're treating these as text?
+-- | (Un)pickle a UTCTime without the date portion.
 --
---   In any case, we do the simplest thing that is correct for all the
---   XML we've got: pad it to (only) three digits on pickling.
+xp_time :: PU UTCTime
+xp_time =
+  (to_time, from_time) `xpWrapMaybe` xpText
+  where
+    format = "%I:%M %p"
+
+    to_time :: String -> Maybe UTCTime
+    to_time = parseTime defaultTimeLocale format
+
+    from_time :: UTCTime -> String
+    from_time = formatTime defaultTimeLocale format
+
+
+
+-- | Parse a team_id. These are (so far!) three characters long, and
+--   not necessarily numeric. For simplicity, we return a 'String'
+--   rather than e.g. a @(Char, Char, Char)@. But unpickling will fail
+--   if the team_id is longer than three characters.
 --
-xp_team_id :: PU Int
+xp_team_id :: PU String
 xp_team_id =
   (to_team_id, from_team_id) `xpWrapMaybe` xpText
   where
-    to_team_id :: String -> Maybe Int
-    to_team_id = readMaybe
+    to_team_id :: String -> Maybe String
+    to_team_id s
+      | length s <= 3 = Just s
+      | otherwise = Nothing
 
-    from_team_id :: Int -> String
-    from_team_id = printf "%03d"
+    from_team_id :: String -> String
+    from_team_id = id