fix bug where resuming a transfer also started one queued transfer
This commit is contained in:
parent
742eaef0a1
commit
34aeecb78a
2 changed files with 7 additions and 11 deletions
|
@ -209,16 +209,15 @@ cancelTransfer pause t = do
|
||||||
startTransfer :: Transfer -> Handler ()
|
startTransfer :: Transfer -> Handler ()
|
||||||
startTransfer t = do
|
startTransfer t = do
|
||||||
m <- getCurrentTransfers
|
m <- getCurrentTransfers
|
||||||
webapp <- getYesod
|
maybe startqueued go (M.lookup t m)
|
||||||
let dstatus = daemonStatus webapp
|
|
||||||
let q = transferQueue webapp
|
|
||||||
{- resume a paused transfer -}
|
|
||||||
maybe noop go (M.lookup t m)
|
|
||||||
{- start a queued transfer -}
|
|
||||||
is <- liftIO $ map snd <$> getMatchingTransfers q dstatus (== t)
|
|
||||||
maybe noop start $ headMaybe is
|
|
||||||
where
|
where
|
||||||
go info = maybe (start info) (resume info) $ transferTid info
|
go info = maybe (start info) (resume info) $ transferTid info
|
||||||
|
startqueued = do
|
||||||
|
webapp <- getYesod
|
||||||
|
let dstatus = daemonStatus webapp
|
||||||
|
let q = transferQueue webapp
|
||||||
|
is <- liftIO $ map snd <$> getMatchingTransfers q dstatus (== t)
|
||||||
|
maybe noop start $ headMaybe is
|
||||||
resume info tid = do
|
resume info tid = do
|
||||||
webapp <- getYesod
|
webapp <- getYesod
|
||||||
let dstatus = daemonStatus webapp
|
let dstatus = daemonStatus webapp
|
||||||
|
|
|
@ -3,9 +3,6 @@ all the other git clones, at both the git level and the key/value level.
|
||||||
|
|
||||||
## immediate action items
|
## immediate action items
|
||||||
|
|
||||||
* There's apparently a race, as sometimes pausing a transfer causes it to start
|
|
||||||
one of the other queued transfers.
|
|
||||||
|
|
||||||
## longer-term TODO
|
## longer-term TODO
|
||||||
|
|
||||||
* Test MountWatcher on LXDE.
|
* Test MountWatcher on LXDE.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue