From: Michael Orlitzky Date: Fri, 27 Jun 2014 19:54:21 +0000 (-0400) Subject: Rename xp_racedate to xp_datetime. X-Git-Tag: 0.0.6~64 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=9320bfe4aa73724f5988f88f13d5882d9119be39;p=dead%2Fhtsn-import.git Rename xp_racedate to xp_datetime. Add an xp_time_dots (un)pickler. --- diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs index ea335c8..f697b8c 100644 --- a/src/TSN/Picklers.hs +++ b/src/TSN/Picklers.hs @@ -4,11 +4,12 @@ module TSN.Picklers ( 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 @@ -133,8 +134,8 @@ xp_earnings = from_earnings (Just i) = format_commas i --- | (Un)pickle a 'UTCTime' from a \ element in an --- 'AutoRaceResults' message. +-- | (Un)pickle an unpadded 'UTCTime'. Used for example on the +-- \ elements in an 'AutoRaceResults' message. -- -- Examples: -- @@ -142,17 +143,17 @@ xp_earnings = -- -- * \5/24/2014 2:45:00 PM\ -- -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 @@ -219,6 +220,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: +-- +-- * \11:30 A.M.\ +-- +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'). -- diff --git a/src/TSN/XML/AutoRacingResults.hs b/src/TSN/XML/AutoRacingResults.hs index 179b8ab..d96c749 100644 --- a/src/TSN/XML/AutoRacingResults.hs +++ b/src/TSN/XML/AutoRacingResults.hs @@ -60,7 +60,7 @@ import Text.XML.HXT.Core ( import TSN.Codegen ( tsn_codegen_config ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) -import TSN.Picklers ( xp_earnings, xp_racedate, xp_time_stamp ) +import TSN.Picklers ( xp_earnings, xp_datetime, xp_time_stamp ) import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) ) import Xml ( FromXml(..), @@ -472,7 +472,7 @@ pickle_message = (xpElem "category" xpText) (xpElem "sport" xpText) (xpElem "RaceID" xpInt) - (xpElem "RaceDate" xp_racedate) + (xpElem "RaceDate" xp_datetime) (xpElem "Title" xpText) (xpElem "Track_Location" xpText) (xpElem "Laps_Remaining" xpInt)