when canceling a transfer, also cancel all other downloads of the same key
This commit is contained in:
parent
9e54355e8b
commit
99525f8454
3 changed files with 14 additions and 7 deletions
|
@ -140,12 +140,13 @@ getNextTransfer q dstatus acceptable = atomically $ do
|
|||
return $ Just r
|
||||
else return Nothing
|
||||
|
||||
{- Removes a transfer from the queue, if present, and returns True if it
|
||||
- was present. -}
|
||||
{- Removes a transfer (as well as any equivilant transfers) from the queue,
|
||||
- and returns True if anything was removed. -}
|
||||
dequeueTransfer :: TransferQueue -> DaemonStatusHandle -> Transfer -> IO Bool
|
||||
dequeueTransfer q dstatus t = do
|
||||
ok <- atomically $ do
|
||||
(l, removed) <- partition (\i -> fst i /= t) <$> readTVar (queuelist q)
|
||||
(removed, l) <- partition (equivilantTransfer t . fst)
|
||||
<$> readTVar (queuelist q)
|
||||
void $ writeTVar (queuesize q) (length l)
|
||||
void $ writeTVar (queuelist q) l
|
||||
return $ not $ null removed
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -60,6 +60,13 @@ readLcDirection "upload" = Just Upload
|
|||
readLcDirection "download" = Just Download
|
||||
readLcDirection _ = Nothing
|
||||
|
||||
{- Transfers that will accomplish the same task. -}
|
||||
equivilantTransfer :: Transfer -> Transfer -> Bool
|
||||
equivilantTransfer t1 t2
|
||||
| transferDirection t1 == Download && transferDirection t2 == Download &&
|
||||
transferUUID t1 == transferUUID t2 = True
|
||||
| otherwise = t1 == t2
|
||||
|
||||
percentComplete :: Transfer -> TransferInfo -> Maybe Percentage
|
||||
percentComplete (Transfer { transferKey = key }) info =
|
||||
percentage <$> keySize key <*> Just (fromMaybe 0 $ bytesComplete info)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue