added an alert after a file transfer

This commit is contained in:
Joey Hess 2012-08-06 17:09:23 -04:00
parent 05ed196ce5
commit 8f1a9ef8b5
5 changed files with 46 additions and 38 deletions

View file

@ -198,6 +198,8 @@ safeToAdd st changes = runThreadState st $
openfiles <- S.fromList . map fst3 . filter openwrite <$>
liftIO (Lsof.queryDir tmpdir)
-- TODO this is here for debugging a problem on
-- OSX, and is pretty expensive, so remove later
liftIO $ debug thisThread
[ "checking changes:"
, show changes

View file

@ -163,7 +163,7 @@ handleMount st dstatus scanremotes dir = do
unless (null rs) $ do
let nonspecial = filter (Git.repoIsLocal . Remote.repo) rs
unless (null nonspecial) $ do
void $ alertWhile dstatus (syncMountAlert dir nonspecial) $ do
void $ alertWhile dstatus (syncAlert nonspecial) $ do
debug thisThread ["syncing with", show rs]
sync nonspecial =<< runThreadState st (inRepo Git.Branch.current)
addScanRemotes scanremotes nonspecial

View file

@ -12,6 +12,7 @@ import Assistant.ThreadedMonad
import Assistant.DaemonStatus
import Assistant.TransferQueue
import Assistant.TransferSlots
import Assistant.Alert
import Logs.Transfer
import Logs.Presence
import Logs.Location
@ -94,7 +95,8 @@ transferThread st dstatus slots t info = case (transferRemote info, associatedFi
, transferTid = Just tid
}
where
isdownload = transferDirection t == Download
direction = transferDirection t
isdownload = direction == Download
tofrom
| isdownload = "from"
| otherwise = "to"
@ -113,3 +115,6 @@ transferThread st dstatus slots t info = case (transferRemote info, associatedFi
Remote.logStatus remote key InfoPresent
return ok
showEndResult ok
liftIO $ addAlert dstatus $
makeAlertFiller ok $
transferFileAlert direction file