diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-08-29 13:00:41 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-08-29 13:00:41 -0400 |
commit | ffcea3cdab00f2d2f5e8352ee1a97a71c684e626 (patch) | |
tree | 1f6f140e5f62a6e675618a120e5a157dba2fe1ee /Remote/Directory.hs | |
parent | 6256956f4f334b2fe7318f91b6ce86c9a4192c00 (diff) |
add API for exporting
Implemented so far for the directory special remote.
Several remotes don't make sense to export to. Regular Git remotes,
obviously, do not. Bup remotes almost certianly do not, since bup would
need to be used to extract the export; same store for Ddar. Web and
Bittorrent are download-only. GCrypt is always encrypted so exporting to
it would be pointless. There's probably no point complicating the Hook
remotes with exporting at this point. External, S3, Glacier, WebDAV,
Rsync, and possibly Tahoe should be modified to support export.
Thought about trying to reuse the storeKey/retrieveKeyFile/removeKey
interface, rather than adding a new interface. But, it seemed better to
keep it separate, to avoid a complicated interface that sometimes
encrypts/chunks key/value storage and sometimes users non-key/value
storage. Any common parts can be factored out.
Note that storeExport is not atomic.
doc/design/exporting_trees_to_special_remotes.mdwn has some things in
the "resuming exports" section that bear on this decision. Basically,
I don't think, at this time, that an atomic storeExport would help with
resuming, because exports are not key/value storage, and we can't be
sure that a partially uploaded file is the same content we're currently
trying to export.
Also, note that ExportLocation will always use unix path separators.
This is important, because users may export from a mix of windows and
unix, and it avoids complicating the API with path conversions,
and ensures that in such a mix, they always use the same locations for
exports.
This commit was sponsored by Bruno BEAUFILS on Patreon.
Diffstat (limited to 'Remote/Directory.hs')
-rw-r--r-- | Remote/Directory.hs | 74 |
1 files changed, 63 insertions, 11 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 2452c42e2..a371a1951 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -1,6 +1,6 @@ {- A "remote" that is just a filesystem directory. - - - Copyright 2011-2014 Joey Hess <id@joeyh.name> + - Copyright 2011-2017 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -58,6 +58,11 @@ gen r u c gc = do , lockContent = Nothing , checkPresent = checkPresentDummy , checkPresentCheap = True + , storeExport = Just $ storeExportDirectory dir + , retrieveExport = Just $ retrieveExportDirectory dir + , removeExport = Just $ removeExportDirectory dir + , checkPresentExport = Just $ checkPresentExportDirectory dir + , renameExport = Just $ renameExportDirectory dir , whereisKey = Nothing , remoteFsck = Nothing , repairRepo = Nothing @@ -119,16 +124,18 @@ tmpDir d k = addTrailingPathSeparator $ d </> "tmp" </> keyFile k {- Check if there is enough free disk space in the remote's directory to - store the key. Note that the unencrypted key size is checked. -} prepareStore :: FilePath -> ChunkConfig -> Preparer Storer -prepareStore d chunkconfig = checkPrepare checker +prepareStore d chunkconfig = checkPrepare (checkDiskSpaceDirectory d) (byteStorer $ store d chunkconfig) where - checker k = do - annexdir <- fromRepo gitAnnexObjectDir - samefilesystem <- liftIO $ catchDefaultIO False $ - (\a b -> deviceID a == deviceID b) - <$> getFileStatus d - <*> getFileStatus annexdir - checkDiskSpace (Just d) k 0 samefilesystem + +checkDiskSpaceDirectory :: FilePath -> Key -> Annex Bool +checkDiskSpaceDirectory d k = do + annexdir <- fromRepo gitAnnexObjectDir + samefilesystem <- liftIO $ catchDefaultIO False $ + (\a b -> deviceID a == deviceID b) + <$> getFileStatus d + <*> getFileStatus annexdir + checkDiskSpace (Just d) k 0 samefilesystem store :: FilePath -> ChunkConfig -> Key -> L.ByteString -> MeterUpdate -> Annex Bool store d chunkconfig k b p = liftIO $ do @@ -211,11 +218,56 @@ removeDirGeneric topdir dir = do checkKey :: FilePath -> ChunkConfig -> CheckPresent checkKey d (LegacyChunks _) k = Legacy.checkKey d locations k -checkKey d _ k = liftIO $ - ifM (anyM doesFileExist (locations d k)) +checkKey d _ k = checkPresentGeneric d (locations d k) + +checkPresentGeneric :: FilePath -> [FilePath] -> Annex Bool +checkPresentGeneric d ps = liftIO $ + ifM (anyM doesFileExist ps) ( return True , ifM (doesDirectoryExist d) ( return False , giveup $ "directory " ++ d ++ " is not accessible" ) ) + +exportPath :: FilePath -> ExportLocation -> FilePath +exportPath d (ExportLocation loc) = d </> loc + +storeExportDirectory :: FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool +storeExportDirectory d k loc p = sendAnnex k rollback send + where + dest = exportPath d loc + send src = liftIO $ catchBoolIO $ do + createDirectoryIfMissing True dest + withMeteredFile src p (L.writeFile dest) + return True + rollback = liftIO $ nukeFile dest + +retrieveExportDirectory :: FilePath -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex (Bool, Verification) +retrieveExportDirectory d _k loc dest p = unVerified $ liftIO $ catchBoolIO $ do + withMeteredFile src p (L.writeFile dest) + return True + where + src = exportPath d loc + +removeExportDirectory :: FilePath -> Key -> ExportLocation -> Annex Bool +removeExportDirectory d _k loc = liftIO $ do + nukeFile src + void $ tryIO $ removeDirectory $ takeDirectory src + return True + where + src = exportPath d loc + +checkPresentExportDirectory :: FilePath -> Key -> ExportLocation -> Annex Bool +checkPresentExportDirectory d _k loc = + checkPresentGeneric d [exportPath d loc] + +renameExportDirectory :: FilePath -> Key -> ExportLocation -> ExportLocation -> Annex Bool +renameExportDirectory d _k oldloc newloc = liftIO $ catchBoolIO $ do + createDirectoryIfMissing True dest + renameFile src dest + void $ tryIO $ removeDirectory $ takeDirectory src + return True + where + src = exportPath d oldloc + dest = exportPath d newloc |