mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix failure notification

Browse source
This commit is contained in:
Joey Hess 2014-03-22 14:17:57 -04:00
parent e426fac273
commit a5dcd0e4bd
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Annex/Transfer.hs
View file

@ -150,7 +150,9 @@ notifyTransfer direction (Just f) a = do
let action = if direction == Upload then "uploading" else "downloading" let action = if direction == Upload then "uploading" else "downloading"
let basedesc = action ++ " " ++ f let basedesc = action ++ " " ++ f
let startdesc = "started " ++ basedesc let startdesc = "started " ++ basedesc
let enddesc = "finished " ++ basedesc let enddesc ok = if ok
then "finished " ++ basedesc
else basedesc ++ " failed"
if (notifyStart wanted || notifyFinish wanted) if (notifyStart wanted || notifyFinish wanted)
then do then do
client <- liftIO DBus.Client.connectSession client <- liftIO DBus.Client.connectSession
@ -166,12 +168,12 @@ notifyTransfer direction (Just f) a = do
startnotification <- liftIO $ if notifyStart wanted startnotification <- liftIO $ if notifyStart wanted
then Just <$> Notify.notify client (mknote startdesc) then Just <$> Notify.notify client (mknote startdesc)
else pure Nothing else pure Nothing
r <- a NotifyWitness ok <- a NotifyWitness
when (notifyFinish wanted) $ liftIO $ void $ maybe when (notifyFinish wanted) $ liftIO $ void $ maybe
(Notify.notify client $ mknote enddesc) (Notify.notify client $ mknote $ enddesc ok)
(\n -> Notify.replace client n $ mknote enddesc) (\n -> Notify.replace client n $ mknote $ enddesc ok)
startnotification startnotification
return r return ok
else a NotifyWitness else a NotifyWitness
#else #else
a NotifyWitness a NotifyWitness