avoid possibly re-adding a removed transfer when updating its info

Doesn't fix the bug I thought it'd fix, but is clearly correct.
This commit is contained in:
Joey Hess 2012-08-28 14:19:11 -04:00
parent 7024a973b2
commit 1296cfb09a
4 changed files with 22 additions and 13 deletions

View file

@ -215,6 +215,14 @@ readTransferInfo mpid s =
(bits, filebits) = splitAt 1 $ lines s
filename = join "\n" filebits
{- Preserves the old transferTid and transferPaused values,
- which are not written to disk. -}
mergeTransferInfo :: TransferInfo -> TransferInfo -> TransferInfo
mergeTransferInfo new old = new
{ transferTid = maybe (transferTid new) Just (transferTid old)
, transferPaused = transferPaused new || transferPaused old
}
parsePOSIXTime :: String -> Maybe POSIXTime
parsePOSIXTime s = utcTimeToPOSIXSeconds
<$> parseTime defaultTimeLocale "%s%Qs" s