mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

parse "5" as 5 seconds

Browse source
This commit is contained in:
Joey Hess 2013-10-26 12:07:00 -04:00
parent 323fb55a31
commit 4830c0d830
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Utility/HumanTime.hs
View file

@ -35,9 +35,11 @@ parseDuration = Duration <$$> go 0
go n [] = return n go n [] = return n
go n s = do go n s = do
num <- readish s :: Maybe Integer num <- readish s :: Maybe Integer
let (c:rest) = dropWhile isDigit s case dropWhile isDigit s of
u <- M.lookup c unitmap (c:rest) -> do
go (n + num * u) rest u <- M.lookup c unitmap
go (n + num * u) rest
_ -> return $ n + num
fromDuration :: Duration -> String fromDuration :: Duration -> String
fromDuration Duration { durationSeconds = d } fromDuration Duration { durationSeconds = d }