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

Improve SHA*E extension extraction code.

Browse source 
Filter out over-long "extensions" before stripping out non-alphanumerics
from them, so that eg "foo.ba__________r" is not considered a .bar
extension.
This commit is contained in:
Joey Hess 2016-05-27 13:14:51 -04:00
parent d2fa4a6873
commit 45308ec78b
Failed to extract signature
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Backend/Hash.hs
View file

@ -101,8 +101,9 @@ selectExtension f
| otherwise = intercalate "." ("":es) | otherwise = intercalate "." ("":es)
where where
es = filter (not . null) $ reverse $ es = filter (not . null) $ reverse $
take 2 $ takeWhile shortenough $ take 2 $ map (filter validInExtension) $
reverse $ split "." $ filter validInExtension $ takeExtensions f takeWhile shortenough $
reverse $ split "." $ takeExtensions f
shortenough e = length e <= 4 -- long enough for "jpeg" shortenough e = length e <= 4 -- long enough for "jpeg"
{- A key's checksum is checked during fsck. -} {- A key's checksum is checked during fsck. -}

6
CHANGELOG
View file

@ -1,3 +1,9 @@
git-annex (6.20160528) UNRELEASED; urgency=medium
* Improve SHA*E extension extraction code.
-- Joey Hess <id@joeyh.name> Fri, 27 May 2016 13:12:48 -0400
git-annex (6.20160527) unstable; urgency=medium git-annex (6.20160527) unstable; urgency=medium
* Split lines in the git-annex branch on \r as well as \n, to deal * Split lines in the git-annex branch on \r as well as \n, to deal

2
doc/bugs/strips___95___from_extensions_in_E_backends__63__.mdwn
View file

@ -13,3 +13,5 @@ lrwxrwxrwx 1 yoh yoh 126 May 25 14:27 ds001_R1.1.0_raw.tgz -> .git/annex/objects
"""]] """]]
[[!meta author=yoh]] [[!meta author=yoh]]
> [[fixed|done]] --[[Joey]]