diff options
| -rw-r--r-- | Remote/Directory.hs | 12 | ||||
| -rw-r--r-- | Types/Remote.hs | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index a371a1951..342b5bc57 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -233,15 +233,13 @@ checkPresentGeneric d ps = liftIO $ 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 +storeExportDirectory :: FilePath -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool +storeExportDirectory d src _k loc p = liftIO $ catchBoolIO $ do + createDirectoryIfMissing True dest + withMeteredFile src p (L.writeFile dest) + return True 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 diff --git a/Types/Remote.hs b/Types/Remote.hs index d4b76f54f..6a4d2039e 100644 --- a/Types/Remote.hs +++ b/Types/Remote.hs @@ -97,20 +97,20 @@ data RemoteA a = Remote { -- operation. checkPresentCheap :: Bool, - -- Exports a key's contents to an ExportLocation. + -- Exports content to an ExportLocation. -- The exported file does not need to be updated atomically. - storeExport :: Maybe (Key -> ExportLocation -> MeterUpdate -> a Bool), - -- Retrieves an exported key to a file. + storeExport :: Maybe (FilePath -> Key -> ExportLocation -> MeterUpdate -> a Bool), + -- Retrieves exported content to a file. -- (The MeterUpdate does not need to be used if it writes -- sequentially to the file.) retrieveExport :: Maybe (Key -> ExportLocation -> FilePath -> MeterUpdate -> a (Bool, Verification)), - -- Removes an exported key (succeeds if the contents are not present) + -- Removes an exported file (succeeds if the contents are not present) removeExport :: Maybe (Key -> ExportLocation -> a Bool), - -- Checks if a key is exported to the remote at the specified + -- Checks if anything is exported to the remote at the specified -- ExportLocation. -- Throws an exception if the remote cannot be accessed. checkPresentExport :: Maybe (Key -> ExportLocation -> a Bool), - -- Renames an already exported key. + -- Renames an already exported file. renameExport :: Maybe (Key -> ExportLocation -> ExportLocation -> a Bool), -- Some remotes can provide additional details for whereis. |