X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FPicklers.hs;h=608f907e5b43896dc059e6aca8ea5be144b9fc46;hb=9e052ffac372ddda44a4661c9d3e0551a9f32a56;hp=c70b2ba84edc5d627575622d1bb2a609f99bb195;hpb=a4dd6d2d508db8dbc28a514cc7a71a3260587f4c;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs
index c70b2ba..608f907 100644
--- a/src/TSN/Picklers.hs
+++ b/src/TSN/Picklers.hs
@@ -19,6 +19,12 @@ import Text.XML.HXT.Arrow.Pickle (
   xpWrapMaybe )
 import Text.XML.HXT.Arrow.Pickle.Xml ( PU )
 
+-- Local imports.
+import TSN.Parse (
+  parse_time_stamp,
+  time_format,
+  time_stamp_format )
+
 
 -- | (Un)pickle a UTCTime without the time portion.
 --
@@ -83,10 +89,7 @@ xp_gamedate =
 
 
 
--- | The time format string used in 'xp_time' and 'xp_time_stamp'.
---
-xp_time_format :: String
-xp_time_format = "%I:%M %p"
+
 
 
 -- | (Un)pickle a UTCTime without the date portion.
@@ -96,10 +99,10 @@ xp_time =
   (to_time, from_time) `xpWrapMaybe` xpText
   where
     to_time :: String -> Maybe UTCTime
-    to_time = parseTime defaultTimeLocale xp_time_format
+    to_time = parseTime defaultTimeLocale time_format
 
     from_time :: UTCTime -> String
-    from_time = formatTime defaultTimeLocale xp_time_format
+    from_time = formatTime defaultTimeLocale time_format
 
 
 -- | (Un)pickle a UTCTime without the date portion, allowing for a
@@ -112,11 +115,12 @@ xp_tba_time =
     to_time :: String -> Maybe UTCTime
     to_time s
       | s == "TBA" = Nothing
-      | otherwise = parseTime defaultTimeLocale xp_time_format s
+      | otherwise = parseTime defaultTimeLocale time_format s
 
     from_time :: Maybe UTCTime -> String
     from_time Nothing = ""
-    from_time (Just t) = formatTime defaultTimeLocale xp_time_format t
+    from_time (Just t) = formatTime defaultTimeLocale time_format t
+
 
 
 -- | (Un)pickle the \<time_stamp\> element format to/from a 'UTCTime'.
@@ -129,22 +133,14 @@ xp_tba_time =
 --
 xp_time_stamp :: PU UTCTime
 xp_time_stamp =
-  (to_time_stamp, from_time_stamp) `xpWrapMaybe` xpText
+  (parse_time_stamp, from_time_stamp) `xpWrapMaybe` xpText
   where
-    -- This omits the timezone and trailing space.
-    format = " %B %-d, %Y, at " ++ xp_time_format ++ " ET "
-
     five_hours :: NominalDiffTime
     five_hours = 5 * 60 * 60
 
-    add_five :: UTCTime -> UTCTime
-    add_five = addUTCTime five_hours
-
     subtract_five :: UTCTime -> UTCTime
     subtract_five = addUTCTime (-1 * five_hours)
 
-    to_time_stamp :: String -> Maybe UTCTime
-    to_time_stamp = fmap add_five . parseTime defaultTimeLocale format
-
     from_time_stamp :: UTCTime -> String
-    from_time_stamp = formatTime defaultTimeLocale format . subtract_five
+    from_time_stamp =
+      formatTime defaultTimeLocale time_stamp_format . subtract_five