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

bup encryption support 100% working

Browse source
This commit is contained in:
Joey Hess 2011-04-17 00:57:11 -04:00
parent b6b04642c8
commit 9606409b9d
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Remote/Bup.hs
View file

@ -17,6 +17,7 @@ import System.Process
import System.Exit import System.Exit
import System.FilePath import System.FilePath
import Data.List.Utils import Data.List.Utils
import System.Cmd.Utils
import RemoteClass import RemoteClass
import Types import Types
@ -124,7 +125,7 @@ storeEncrypted r buprepo (cipher, enck) k = do
g <- Annex.gitRepo g <- Annex.gitRepo
let src = gitAnnexLocation g k let src = gitAnnexLocation g k
params <- bupSplitParams r buprepo enck (Param "-") params <- bupSplitParams r buprepo enck (Param "-")
liftIO $ flip catch (const $ return False) $ do liftIO $ catchBool $ do
content <- L.readFile src content <- L.readFile src
withEncryptedContentHandle cipher content $ \h -> do withEncryptedContentHandle cipher content $ \h -> do
pipeBup params (Just h) Nothing pipeBup params (Just h) Nothing
@ -132,13 +133,19 @@ storeEncrypted r buprepo (cipher, enck) k = do
retrieve :: BupRepo -> Key -> FilePath -> Annex Bool retrieve :: BupRepo -> Key -> FilePath -> Annex Bool
retrieve buprepo k f = do retrieve buprepo k f = do
let params = bupParams "join" buprepo [Param $ show k] let params = bupParams "join" buprepo [Param $ show k]
liftIO $ flip catch (const $ return False) $ do liftIO $ catchBool $ do
tofile <- openFile f WriteMode tofile <- openFile f WriteMode
pipeBup params Nothing (Just tofile) pipeBup params Nothing (Just tofile)
retrieveEncrypted :: BupRepo -> (Cipher, Key) -> FilePath -> Annex Bool retrieveEncrypted :: BupRepo -> (Cipher, Key) -> FilePath -> Annex Bool
retrieveEncrypted bupreoo (cipher, enck) f = do retrieveEncrypted buprepo (cipher, enck) f = do
error "TODO" let params = bupParams "join" buprepo [Param $ show enck]
liftIO $ catchBool $ do
(pid, h) <- hPipeFrom "bup" $ toCommand params
content <- L.hGetContents h
withDecryptedContent cipher content $ L.writeFile f
forceSuccess pid
return True
remove :: Key -> Annex Bool remove :: Key -> Annex Bool
remove _ = do remove _ = do