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

simplify

Browse source
This commit is contained in:
Joey Hess 2012-11-18 18:27:53 -04:00
parent 81379bb29c
commit c8751be151
3 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Remote/WebDAV.hs
View file

@ -116,19 +116,15 @@ retrieve :: Remote -> Key -> AssociatedFile -> FilePath -> Annex Bool
retrieve r k _f d = metered Nothing k $ \meterupdate ->
davAction r False $ \(baseurl, user, pass) -> liftIO $ catchBoolIO $
withStoredFiles r k baseurl user pass onerr $ \urls -> do
meteredWriteFileChunks meterupdate d urls $
feeder user pass
meteredWriteFileChunks meterupdate d urls $ \url -> do
mb <- davGetUrlContent url user pass
case mb of
Nothing -> throwIO "download failed"
Just b -> return b
return True
where
onerr _ = return False
feeder _ _ [] = return ([], [])
feeder user pass (url:urls) = do
mb <- davGetUrlContent url user pass
case mb of
Nothing -> throwIO "download failed"
Just b -> return (urls, L.toChunks b)
retrieveEncrypted :: Remote -> (Cipher, Key) -> Key -> FilePath -> Annex Bool
retrieveEncrypted r (cipher, enck) k d = metered Nothing k $ \meterupdate ->
davAction r False $ \(baseurl, user, pass) -> liftIO $ catchBoolIO $