From ac71b499ac6d53408cfce19a1ddd00bfa4b2645f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Nov 2012 18:27:53 -0400 Subject: simplify --- Remote/Directory.hs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Remote/Directory.hs') diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 0527270a1..a61ef83c0 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -180,13 +180,8 @@ retrieve :: FilePath -> ChunkSize -> Key -> AssociatedFile -> FilePath -> Annex retrieve d chunksize k _ f = metered Nothing k $ \meterupdate -> liftIO $ withStoredFiles chunksize d k $ \files -> catchBoolIO $ do - meteredWriteFileChunks meterupdate f files feeder + meteredWriteFileChunks meterupdate f files $ L.readFile return True - where - feeder [] = return ([], []) - feeder (x:xs) = do - chunks <- L.toChunks <$> L.readFile x - return (xs, chunks) retrieveEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> FilePath -> Annex Bool retrieveEncrypted d chunksize (cipher, enck) k f = metered Nothing k $ \meterupdate -> -- cgit v1.2.3