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

fix exporting files in subdirectories to webdav

Browse source 
Use tmp/key when exporting, so the whole export directory structure does
not have to be created under tmp/

This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
Joey Hess 2017-09-13 15:03:37 -04:00
parent 969ac892a8
commit 955c616956
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Remote/WebDAV.hs
View file

@ -179,9 +179,9 @@ checkKey r chunkconfig (Just dav) k = do
either giveup return v either giveup return v
storeExportDav :: Maybe DavHandle -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool storeExportDav :: Maybe DavHandle -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool
storeExportDav mh f _k loc p = runExport mh $ \dav -> do storeExportDav mh f k loc p = runExport mh $ \dav -> do
reqbody <- liftIO $ httpBodyStorer f p reqbody <- liftIO $ httpBodyStorer f p
storeHelper dav (exportTmpLocation loc) (exportLocation loc) reqbody storeHelper dav (keyTmpLocation k) (exportLocation loc) reqbody
return True return True
retrieveExportDav :: Maybe DavHandle -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Bool retrieveExportDav :: Maybe DavHandle -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Bool

3
Remote/WebDAV/DavLocation.hs
View file

@ -53,9 +53,6 @@ keyTmpLocation = tmpLocation . keyFile
exportLocation :: ExportLocation -> DavLocation exportLocation :: ExportLocation -> DavLocation
exportLocation (ExportLocation f) = f exportLocation (ExportLocation f) = f
exportTmpLocation :: ExportLocation -> DavLocation
exportTmpLocation (ExportLocation f) = tmpLocation f
tmpLocation :: FilePath -> DavLocation tmpLocation :: FilePath -> DavLocation
tmpLocation f = tmpDir </> f tmpLocation f = tmpDir </> f