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

avoid partial functions

Browse source 
This is horrible old code and ghc has started to warn about head and
tail. Rewrote it to avoid all partial functions except !! and guarded
uses of !! with length checks.
This commit is contained in:
Joey Hess 2024-07-30 11:27:20 -04:00
parent 41cef62dad
commit 43b8d96d8a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Upgrade/V1.hs
View file

@ -1,6 +1,6 @@
{- git-annex v1 -> v2 upgrade support {- git-annex v1 -> v2 upgrade support
- -
- Copyright 2011 Joey Hess <id@joeyh.name> - Copyright 2011-2024 Joey Hess <id@joeyh.name>
- -
- Licensed under the GNU AGPL version 3 or higher. - Licensed under the GNU AGPL version 3 or higher.
-} -}
@ -18,6 +18,7 @@ import qualified Data.ByteString.Short as S (toShort, fromShort)
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import qualified System.FilePath.ByteString as P import qualified System.FilePath.ByteString as P
import System.PosixCompat.Files (isRegularFile) import System.PosixCompat.Files (isRegularFile)
import Text.Read
import Annex.Common import Annex.Common
import Types.Upgrade import Types.Upgrade
@ -149,13 +150,16 @@ oldlog2key l
-- WORM backend keys: "WORM:mtime:size:filename" -- WORM backend keys: "WORM:mtime:size:filename"
-- all the rest: "backend:key" -- all the rest: "backend:key"
-- --
-- If the file looks like "WORM:XXX-...", then it was created by mixing -- If the file looks like "WORM:FOO-...", then it was created by mixing
-- v2 and v1; that infelicity is worked around by treating the value -- v2 and v1; that infelicity is worked around by treating the value
-- as the v2 key that it is. -- as the v2 key that it is.
readKey1 :: String -> Key readKey1 :: String -> Key
readKey1 v readKey1 = fromMaybe (giveup "unable to parse v0 key") . readKey1'
| mixup = fromJust $ deserializeKey $ intercalate ":" $ Prelude.tail bits
| otherwise = mkKey $ \d -> d readKey1' :: String -> Maybe Key
readKey1' v
| mixup = deserializeKey $ intercalate ":" $ drop 1 bits
| otherwise = Just $ mkKey $ \d -> d
{ keyName = S.toShort (encodeBS n) { keyName = S.toShort (encodeBS n)
, keyVariety = parseKeyVariety (encodeBS b) , keyVariety = parseKeyVariety (encodeBS b)
, keySize = s , keySize = s
@ -166,13 +170,13 @@ readKey1 v
b = Prelude.head bits b = Prelude.head bits
n = intercalate ":" $ drop (if wormy then 3 else 1) bits n = intercalate ":" $ drop (if wormy then 3 else 1) bits
t = if wormy t = if wormy
then Just (Prelude.read (bits !! 1) :: EpochTime) then readMaybe (bits !! 1) :: Maybe EpochTime
else Nothing else Nothing
s = if wormy s = if wormy && length bits > 2
then Just (Prelude.read (bits !! 2) :: Integer) then readMaybe (bits !! 2) :: Maybe Integer
else Nothing else Nothing
wormy = Prelude.head bits == "WORM" wormy = length bits > 1 && headMaybe bits == Just "WORM"
mixup = wormy && isUpper (Prelude.head $ bits !! 1) mixup = wormy && fromMaybe False (isUpper <$> (headMaybe $ bits !! 1))
showKey1 :: Key -> String showKey1 :: Key -> String
showKey1 k = intercalate ":" $ filter (not . null) showKey1 k = intercalate ":" $ filter (not . null)