diff options
author | Joey Hess <joey@kitenet.net> | 2012-08-29 15:24:09 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-08-29 15:24:09 -0400 |
commit | 99525f8454ecdcc41b37d8fcae83502ea5044d43 (patch) | |
tree | e0e5d0b20fd0e4556fb6d23a3e62a97d3a229319 /Assistant/WebApp/DashBoard.hs | |
parent | 9e54355e8b6751f6ce786da480566e27fb5996d8 (diff) |
when canceling a transfer, also cancel all other downloads of the same key
Diffstat (limited to 'Assistant/WebApp/DashBoard.hs')
-rw-r--r-- | Assistant/WebApp/DashBoard.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs index 8b430d4d0..f21295bf6 100644 --- a/Assistant/WebApp/DashBoard.hs +++ b/Assistant/WebApp/DashBoard.hs @@ -57,14 +57,13 @@ transfersDisplay warnNoScript = do isrunning info = not $ transferPaused info || isNothing (startedTime info) -{- Simplifies a list of transfers, avoiding display of redundant downloads, - - that appear immediately after a download of the same key. -} +{- Simplifies a list of transfers, avoiding display of redundant + - equivilant transfers. -} simplifyTransfers :: [(Transfer, TransferInfo)] -> [(Transfer, TransferInfo)] simplifyTransfers [] = [] simplifyTransfers (x:[]) = [x] simplifyTransfers (v@(t1, _):r@((t2, _):l)) - | transferDirection t1 == Download && transferDirection t2 == Download && - transferKey t1 == transferKey t2 = simplifyTransfers (v:l) + | equivilantTransfer t1 t2 = simplifyTransfers (v:l) | otherwise = v : (simplifyTransfers r) {- Called by client to get a display of currently in process transfers. |