assistant: Now detects immediately when other repositories push changes to
a ssh remote, and pulls. XMPP is no longer needed in this configuration! Requires the remote server have git-annex-shell with notifychanges support. (untested) This commit was sponsored by Geog Wechslberger.
This commit is contained in:
parent
cbcb7f50d8
commit
fac7bca05b
11 changed files with 150 additions and 7 deletions
|
@ -16,6 +16,7 @@ import qualified Remote
|
|||
import Utility.Tense
|
||||
import Logs.Transfer
|
||||
import Types.Distribution
|
||||
import Git.Types (RemoteName)
|
||||
|
||||
import Data.String
|
||||
import qualified Data.Text as T
|
||||
|
@ -117,11 +118,14 @@ commitAlert :: Alert
|
|||
commitAlert = activityAlert Nothing
|
||||
[Tensed "Committing" "Committed", "changes to git"]
|
||||
|
||||
showRemotes :: [Remote] -> TenseChunk
|
||||
showRemotes = UnTensed . T.intercalate ", " . map (T.pack . Remote.name)
|
||||
showRemotes :: [RemoteName] -> TenseChunk
|
||||
showRemotes = UnTensed . T.intercalate ", " . map T.pack
|
||||
|
||||
syncAlert :: [Remote] -> Alert
|
||||
syncAlert rs = baseActivityAlert
|
||||
syncAlert = syncAlert' . map Remote.name
|
||||
|
||||
syncAlert' :: [RemoteName] -> Alert
|
||||
syncAlert' rs = baseActivityAlert
|
||||
{ alertName = Just SyncAlert
|
||||
, alertHeader = Just $ tenseWords
|
||||
[Tensed "Syncing" "Synced", "with", showRemotes rs]
|
||||
|
@ -130,7 +134,12 @@ syncAlert rs = baseActivityAlert
|
|||
}
|
||||
|
||||
syncResultAlert :: [Remote] -> [Remote] -> Alert
|
||||
syncResultAlert succeeded failed = makeAlertFiller (not $ null succeeded) $
|
||||
syncResultAlert succeeded failed = syncResultAlert'
|
||||
(map Remote.name succeeded)
|
||||
(map Remote.name failed)
|
||||
|
||||
syncResultAlert' :: [RemoteName] -> [RemoteName] -> Alert
|
||||
syncResultAlert' succeeded failed = makeAlertFiller (not $ null succeeded) $
|
||||
baseActivityAlert
|
||||
{ alertName = Just SyncAlert
|
||||
, alertHeader = Just $ tenseWords msg
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue