pull in transfer log code from assistant branch

New log file format.
This commit is contained in:
Joey Hess 2012-07-18 21:45:41 -04:00
parent 6d70002233
commit 21d35f88d8
2 changed files with 45 additions and 34 deletions

View file

@ -186,8 +186,8 @@ transfer_list = stat "transfers in progress" $ nojson $ lift $ do
[ show (transferDirection t) ++ "ing"
, fromMaybe (show $ transferKey t) (associatedFile i)
, if transferDirection t == Upload then "to" else "from"
, maybe (fromUUID $ transferRemote t) Remote.name $
M.lookup (transferRemote t) uuidmap
, maybe (fromUUID $ transferUUID t) Remote.name $
M.lookup (transferUUID t) uuidmap
]
disk_size :: Stat