module Diddo
-( LogLine(LogLine)
-, LogEntry(LogEntry)
+( LogEntry(LogEntry)
, DiddoEntry(DiddoEntry)
-, DiddoEntry2(DiddoEntry2)
, parseDiddoLogline
, formatDiddoEntry
, timestamp
, logToDiddoEntry
) where
-import HMSTime( HMSTime, secondsToHMS )
-import Data.List( intercalate )
import Data.DateTime( diffSeconds )
-import Data.Time.LocalTime( TimeZone() )
-import Data.Time.Clock( UTCTime() )
-import Data.Maybe( fromMaybe, fromJust )
+import Data.Maybe( fromMaybe )
+import Data.Time.Clock( UTCTime(), NominalDiffTime(), diffUTCTime )
import Data.Time.Format( parseTime, formatTime )
-import Data.Time.LocalTime( LocalTime(..), ZonedTime(..), TimeZone(..), zonedTimeToUTC, utcToZonedTime, midnight, localDay )
-import Data.List.Split( splitOn )
+import Data.Time.LocalTime( TimeZone() )
+import Data.Time.LocalTime( ZonedTime(..), zonedTimeToUTC, utcToZonedTime )
import System.Locale
-
-data LogLine
- = LogLine String
-
-instance Show LogLine where
- show (LogLine x) = x
-
-data LogEntry
- = LogEntry
- { timestamp :: UTCTime
- , timezone :: TimeZone
- , text :: String
- }
-
-instance Show LogEntry where
- show x = (show $ timestamp x) ++ (show $ timezone x) ++ text x
-
-data DiddoEntry = DiddoEntry String String HMSTime String
-
-data DiddoEntry2 = DiddoEntry2
- { startTime :: ZonedTime
- , endTime :: ZonedTime
- , comment :: String
- }
-
-instance Show DiddoEntry where
- show (DiddoEntry start finish delta entry) = intercalate ";" [start,finish,(show delta),entry]
-
-instance Show DiddoEntry2 where
- show (DiddoEntry2 start finish entry) = intercalate ";" [show start,show finish,show $ diffSeconds (zonedTimeToUTC finish) (zonedTimeToUTC start),entry]
-
-formatDiddoEntry :: String -> DiddoEntry2 -> String
-formatDiddoEntry format (DiddoEntry2 start end comment) = (formatTime defaultTimeLocale format start) ++ ";" ++ (formatTime defaultTimeLocale format end) ++ ";" ++ (show $ secondsToHMS $ diffSeconds (zonedTimeToUTC end) (zonedTimeToUTC start)) ++ ";" ++ comment
-
-logToDiddoEntry :: UTCTime -> LogEntry -> DiddoEntry2
-logToDiddoEntry startutc logentry = DiddoEntry2 startZoned endZoned $ text logentry
+import qualified Data.Text as T
+
+data LogEntry = LogEntry
+ { timestamp :: UTCTime
+ , timezone :: TimeZone
+ , text :: T.Text
+ }
+
+data DiddoEntry = DiddoEntry
+ { startTime :: ZonedTime
+ , endTime :: ZonedTime
+ , comment :: T.Text
+ }
+
+formatDiddoEntry :: String -> DiddoEntry -> T.Text
+formatDiddoEntry format entry = T.intercalate (T.pack ";")
+ [ T.pack $ formatTime defaultTimeLocale format (startTime entry)
+ , T.pack $ formatTime defaultTimeLocale format (endTime entry)
+ , T.pack $ diffTimeToHMSString $ diffUTCTime (zonedTimeToUTC (endTime entry)) (zonedTimeToUTC (startTime entry))
+ , comment entry
+ ]
+
+logToDiddoEntry :: UTCTime -> LogEntry -> DiddoEntry
+logToDiddoEntry startutc logentry = DiddoEntry startZoned endZoned $ text logentry
where
startZoned = utcToZonedTime (timezone logentry) startutc
endZoned = utcToZonedTime (timezone logentry) $ timestamp logentry
-
-lineToEntry :: LogLine -> LogEntry
-lineToEntry (LogLine line) = LogEntry ts tz text
- where
- splitLine = splitOn ";" line
- text = intercalate ";" $ tail splitLine
- time = parseISOsecondsTime $ head splitLine
- (ts,tz) = (zonedTimeToUTC time, zonedTimeZone time)
-
-parseDiddoLogline :: String -> LogEntry
-parseDiddoLogline line = LogEntry ts tz text
+parseDiddoLogline :: T.Text -> LogEntry
+parseDiddoLogline line = LogEntry ts tz string
where
- splitLine = splitOn ";" line
- text = intercalate ";" $ tail splitLine
+ splitLine = T.splitOn (T.pack ";") line
+ string = T.intercalate (T.pack ";") $ tail splitLine
time = parseISOsecondsTime $ head splitLine
(ts,tz) = (zonedTimeToUTC time, zonedTimeZone time)
-
-
-
parseToZonedTime :: String -> String -> ZonedTime
parseToZonedTime format string = fromMaybe (error $ "Input data broken: " ++ string) $ parseTime defaultTimeLocale format string
-parseISOsecondsTime :: String -> ZonedTime
-parseISOsecondsTime = parseToZonedTime $ iso8601DateFormat $ Just "%T%z"
+parseISOsecondsTime :: T.Text -> ZonedTime
+parseISOsecondsTime timestring = parseToZonedTime (iso8601DateFormat $ Just "%T%z") $ T.unpack timestring
+
+diffTimeToHMSString :: NominalDiffTime -> String
+diffTimeToHMSString delta = printf "%d:%02d:%02d" h m s
+ where
+ (mLeft, s) = floor delta `divMod` 60 :: (Int, Int)
+ (h, m) = mLeft `divMod` 60