move display of transfer scan in progress to transfers section of dashboard

This way it's only visible when transfers are not running, which is about
what a user would expect.
This commit is contained in:
Joey Hess 2013-03-19 12:51:22 -04:00
parent a30768cf7f
commit bb284cd980
5 changed files with 30 additions and 21 deletions

View file

@ -14,6 +14,7 @@ import Assistant.WebApp.Utility
import Assistant.WebApp.RepoList
import Assistant.WebApp.Notifications
import Assistant.TransferQueue
import Assistant.DaemonStatus
import Utility.NotificationBroadcaster
import Logs.Transfer
import Utility.Percentage
@ -37,6 +38,10 @@ transfersDisplay warnNoScript = do
queued <- take 10 <$> liftAssistant getTransferQueue
autoUpdate ident NotifierTransfersR (10 :: Int) (10 :: Int)
let transfers = simplifyTransfers $ current ++ queued
let transfersrunning = not $ null transfers
scanrunning <- if transfersrunning
then return False
else liftAssistant $ transferScanRunning <$> getDaemonStatus
$(widgetFile "dashboard/transfers")
where
ident = "transfers"