directory, webdav: Fix bug introduced in version 4.20131002 that caused the chunkcount file to not be written. Work around repositories without such a file, so files can still be retreived from them.
This commit is contained in:
parent
06ea92282f
commit
5756636486
5 changed files with 42 additions and 7 deletions
|
@ -43,6 +43,10 @@ type ChunkExt = String
|
|||
chunkCount :: ChunkExt
|
||||
chunkCount = ".chunkcount"
|
||||
|
||||
{- An infinite stream of extensions to use for chunks. -}
|
||||
chunkStream :: [ChunkExt]
|
||||
chunkStream = map (\n -> ".chunk" ++ show n) [1 :: Integer ..]
|
||||
|
||||
{- Parses the String from the chunkCount file, and returns the files that
|
||||
- are used to store the chunks. -}
|
||||
listChunks :: FilePath -> String -> [FilePath]
|
||||
|
@ -50,9 +54,22 @@ listChunks basedest chunkcount = take count $ map (basedest ++) chunkStream
|
|||
where
|
||||
count = fromMaybe 0 $ readish chunkcount
|
||||
|
||||
{- An infinite stream of extensions to use for chunks. -}
|
||||
chunkStream :: [ChunkExt]
|
||||
chunkStream = map (\n -> ".chunk" ++ show n) [1 :: Integer ..]
|
||||
{- For use when there is no chunkCount file; uses the action to find
|
||||
- chunks, and returns them, or Nothing if none found. Relies on
|
||||
- storeChunks's finalizer atomically moving the chunks into place once all
|
||||
- are written.
|
||||
-
|
||||
- This is only needed to work around a bug that caused the chunkCount file
|
||||
- not to be written.
|
||||
-}
|
||||
probeChunks :: FilePath -> (FilePath -> IO Bool) -> IO [FilePath]
|
||||
probeChunks basedest check = go [] $ map (basedest ++) chunkStream
|
||||
where
|
||||
go l [] = return (reverse l)
|
||||
go l (c:cs) = ifM (check c)
|
||||
( go (c:l) cs
|
||||
, go l []
|
||||
)
|
||||
|
||||
{- Given the base destination to use to store a value,
|
||||
- generates a stream of temporary destinations (just one when not chunking)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue