lifted Assistant.Sync into Assistant monad
lots of nice cleanups
This commit is contained in:
parent
1948202b32
commit
5d57b28a34
9 changed files with 88 additions and 117 deletions
|
@ -124,5 +124,5 @@ makeS3Remote (S3Creds ak sk) name setup config = do
|
|||
makeSpecialRemote name S3.remote config
|
||||
return remotename
|
||||
setup r
|
||||
liftIO $ syncNewRemote st (daemonStatusHandle d) (scanRemoteMap d) r
|
||||
runAssistantY $ syncNewRemote r
|
||||
redirect $ EditNewCloudRepositoryR $ Remote.uuid r
|
||||
|
|
|
@ -283,12 +283,7 @@ makeSsh' rsync setup sshdata keypair =
|
|||
|
||||
makeSshRepo :: Bool -> (Remote -> Handler ()) -> SshData -> Handler RepHtml
|
||||
makeSshRepo forcersync setup sshdata = do
|
||||
d <- getAssistantY id
|
||||
r <- liftIO $ makeSshRemote
|
||||
(threadState d)
|
||||
(daemonStatusHandle d)
|
||||
(scanRemoteMap d)
|
||||
forcersync sshdata
|
||||
r <- runAssistantY $ makeSshRemote forcersync sshdata
|
||||
setup r
|
||||
redirect $ EditNewCloudRepositoryR $ Remote.uuid r
|
||||
|
||||
|
|
|
@ -61,13 +61,7 @@ changeSyncFlag r enabled = runAnnex undefined $ do
|
|||
|
||||
{- Start syncing remote, using a background thread. -}
|
||||
syncRemote :: Remote -> Handler ()
|
||||
syncRemote remote = do
|
||||
d <- getAssistantY id
|
||||
liftIO $ syncNewRemote
|
||||
(threadState d)
|
||||
(daemonStatusHandle d)
|
||||
(scanRemoteMap d)
|
||||
remote
|
||||
syncRemote = runAssistantY . syncNewRemote
|
||||
|
||||
pauseTransfer :: Transfer -> Handler ()
|
||||
pauseTransfer = cancelTransfer True
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue