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

more RawFilePath

Browse source 
Remove dup definitions and just use the RawFilePath one. </> etc are
enough faster that it's probably faster than building a String directly,
although I have not benchmarked.
This commit is contained in:
Joey Hess 2019-12-18 16:45:03 -04:00
parent 9e9def2dc0
commit 686791c4ed
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
26 changed files with 140 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Logs/Transfer.hs
View file

@ -195,12 +195,12 @@ recordFailedTransfer t info = do
transferFile :: Transfer -> Git.Repo -> FilePath
transferFile (Transfer direction u kd) r = transferDir direction r
</> filter (/= '/') (fromUUID u)
</> keyFile (mkKey (const kd))
</> fromRawFilePath (keyFile (mkKey (const kd)))
{- The transfer information file to use to record a failed Transfer -}
failedTransferFile :: Transfer -> Git.Repo -> FilePath
failedTransferFile (Transfer direction u kd) r = failedTransferDir u direction r
</> keyFile (mkKey (const kd))
</> fromRawFilePath (keyFile (mkKey (const kd)))
{- The transfer lock file corresponding to a given transfer info file. -}
transferLockFile :: FilePath -> FilePath
@ -215,7 +215,7 @@ parseTransferFile file
[direction, u, key] -> Transfer
<$> parseDirection direction
<*> pure (toUUID u)
<*> fmap (fromKey id) (fileKey key)
<*> fmap (fromKey id) (fileKey (toRawFilePath key))
_ -> Nothing
where
bits = splitDirectories file