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

add filename to progress bar, and display ok/failed at end

Browse source 
This needed plumbing an AssociatedFile through retrieveKeyFileCheap.
This commit is contained in:
Joey Hess 2015-04-14 16:35:10 -04:00
parent dc4de7faf7
commit a2902cdaaf
21 changed files with 85 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Remote/Directory.hs
View file

@ -156,17 +156,17 @@ retrieve d (LegacyChunks _) = Legacy.retrieve locations d
retrieve d _ = simplyPrepare $ byteRetriever $ \k sink ->
sink =<< liftIO (L.readFile =<< getLocation d k)
retrieveCheap :: FilePath -> ChunkConfig -> Key -> FilePath -> Annex Bool
retrieveCheap :: FilePath -> ChunkConfig -> Key -> AssociatedFile -> FilePath -> Annex Bool
-- no cheap retrieval possible for chunks
retrieveCheap _ (UnpaddedChunks _) _ _ = return False
retrieveCheap _ (LegacyChunks _) _ _ = return False
retrieveCheap _ (UnpaddedChunks _) _ _ _ = return False
retrieveCheap _ (LegacyChunks _) _ _ _ = return False
#ifndef mingw32_HOST_OS
retrieveCheap d NoChunks k f = liftIO $ catchBoolIO $ do
retrieveCheap d NoChunks k _af f = liftIO $ catchBoolIO $ do
file <- getLocation d k
createSymbolicLink file f
return True
#else
retrieveCheap _ _ _ _ = return False
retrieveCheap _ _ _ _ _ = return False
#endif
remove :: FilePath -> Remover