moved module and relicensed
This commit is contained in:
parent
5d97898a7c
commit
2e9f128dea
9 changed files with 13 additions and 12 deletions
|
@ -40,7 +40,7 @@ import Annex.VectorClock
|
|||
import qualified Annex.Branch
|
||||
import qualified Annex
|
||||
import Logs
|
||||
import Logs.TimeStamp
|
||||
import Utility.TimeStamp
|
||||
import Logs.MetaData.Pure
|
||||
|
||||
import qualified Data.Set as S
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
{- log timestamp parsing
|
||||
-
|
||||
- Copyright 2015-2016 Joey Hess <id@joeyh.name>
|
||||
-
|
||||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Logs.TimeStamp where
|
||||
|
||||
import Utility.PartialPrelude
|
||||
import Utility.Misc
|
||||
|
||||
import Data.Time.Clock.POSIX
|
||||
import Data.Time
|
||||
import Data.Ratio
|
||||
#if ! MIN_VERSION_time(1,5,0)
|
||||
import System.Locale
|
||||
#endif
|
||||
|
||||
{- Parses how POSIXTime shows itself: "1431286201.113452s"
|
||||
- Also handles the format with no fractional seconds. -}
|
||||
parsePOSIXTime :: String -> Maybe POSIXTime
|
||||
parsePOSIXTime s = do
|
||||
let (sn, sd) = separate (== '.') s
|
||||
n <- readi sn
|
||||
if null sd
|
||||
then return (fromIntegral n)
|
||||
else do
|
||||
d <- readi sd
|
||||
let r = d % (10 ^ (length sd - 1))
|
||||
return (fromIntegral n + fromRational r)
|
||||
where
|
||||
readi :: String -> Maybe Integer
|
||||
readi = readish
|
||||
|
||||
formatPOSIXTime :: String -> POSIXTime -> String
|
||||
formatPOSIXTime fmt t = formatTime defaultTimeLocale fmt (posixSecondsToUTCTime t)
|
|
@ -18,7 +18,7 @@ import Utility.Metered
|
|||
import Utility.Percentage
|
||||
import Utility.PID
|
||||
import Annex.LockPool
|
||||
import Logs.TimeStamp
|
||||
import Utility.TimeStamp
|
||||
import Logs.File
|
||||
|
||||
import Data.Time.Clock
|
||||
|
|
|
@ -33,7 +33,7 @@ import Data.Time
|
|||
|
||||
import Annex.Common
|
||||
import qualified Annex
|
||||
import Logs.TimeStamp
|
||||
import Utility.TimeStamp
|
||||
import Logs.File
|
||||
|
||||
-- everything that is stored in the unused log
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue