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

fix leading period before two-element extensions

Browse source
This commit is contained in:
Joey Hess 2012-07-06 17:22:56 -06:00
parent 2c4b39be4f
commit 8ad844e45c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Backend/SHA.hs
View file

@ -102,9 +102,13 @@ keyValueE size source = keyValue size source >>= maybe (return Nothing) addE
} }
selectExtension :: FilePath -> String selectExtension :: FilePath -> String
selectExtension = join "." . reverse . take 2 . takeWhile shortenough . selectExtension f
reverse . split "." . takeExtensions | null es = ""
| otherwise = join "." ("":es)
where where
es = filter (not . null) $ reverse $
take 2 $ takeWhile shortenough $
reverse $ split "." $ takeExtensions f
shortenough e shortenough e
| '\n' `elem` e = False -- newline in extension?! | '\n' `elem` e = False -- newline in extension?!
| otherwise = length e <= 4 -- long enough for "jpeg" | otherwise = length e <= 4 -- long enough for "jpeg"