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

remove empty parent dirs when removing from export

Browse source
This commit is contained in:
Joey Hess 2017-08-31 12:32:02 -04:00
parent 943de657b8
commit efe3910c04
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Remote/Directory.hs
View file

@ -230,9 +230,6 @@ checkPresentGeneric d ps = liftIO $
) )
) )
exportPath :: FilePath -> ExportLocation -> FilePath
exportPath d (ExportLocation loc) = d </> loc
storeExportDirectory :: FilePath -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool storeExportDirectory :: FilePath -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool
storeExportDirectory d src _k loc p = liftIO $ catchBoolIO $ do storeExportDirectory d src _k loc p = liftIO $ catchBoolIO $ do
createDirectoryIfMissing True (takeDirectory dest) createDirectoryIfMissing True (takeDirectory dest)
@ -251,7 +248,7 @@ retrieveExportDirectory d _k loc dest p = unVerified $ liftIO $ catchBoolIO $ do
removeExportDirectory :: FilePath -> Key -> ExportLocation -> Annex Bool removeExportDirectory :: FilePath -> Key -> ExportLocation -> Annex Bool
removeExportDirectory d _k loc = liftIO $ do removeExportDirectory d _k loc = liftIO $ do
nukeFile src nukeFile src
void $ tryIO $ removeDirectory $ takeDirectory src removeExportLocation d loc
return True return True
where where
src = exportPath d loc src = exportPath d loc
@ -264,8 +261,21 @@ renameExportDirectory :: FilePath -> Key -> ExportLocation -> ExportLocation ->
renameExportDirectory d _k oldloc newloc = liftIO $ catchBoolIO $ do renameExportDirectory d _k oldloc newloc = liftIO $ catchBoolIO $ do
createDirectoryIfMissing True dest createDirectoryIfMissing True dest
renameFile src dest renameFile src dest
void $ tryIO $ removeDirectory $ takeDirectory src removeExportLocation d oldloc
return True return True
where where
src = exportPath d oldloc src = exportPath d oldloc
dest = exportPath d newloc dest = exportPath d newloc
exportPath :: FilePath -> ExportLocation -> FilePath
exportPath d (ExportLocation loc) = d </> loc
{- Removes the ExportLocation directory and its parents, so long as
- they're empty, up to but not including the topdir. -}
removeExportLocation :: FilePath -> ExportLocation -> IO ()
removeExportLocation topdir (ExportLocation loc) = go (Just loc) (Right ())
where
go _ (Left _e) = return ()
go Nothing _ = return ()
go (Just loc') _ = go (upFrom loc')
=<< tryIO (removeDirectory $ exportPath topdir (ExportLocation loc'))