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

simplify

Browse source
This commit is contained in:
Joey Hess 2011-05-28 16:09:11 -04:00
parent ed2b1eda90
commit 8a4a3be9f6
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command.hs
View file

@ -15,6 +15,7 @@ import System.Path.WildMatch
import Text.Regex.PCRE.Light.Char8 import Text.Regex.PCRE.Light.Char8
import Data.List import Data.List
import Data.Maybe import Data.Maybe
import Data.String.Utils
import Types import Types
import qualified Backend import qualified Backend
@ -195,11 +196,9 @@ filterFiles l = do
wildsRegex :: [String] -> Regex wildsRegex :: [String] -> Regex
wildsRegex ws = compile regex [] wildsRegex ws = compile regex []
where regex = "^(" ++ wildsRegex' ws "" ++ ")" where
wildsRegex' :: [String] -> String -> String regex = "^(" ++ alternatives ++ ")"
wildsRegex' [] c = c alternatives = join "|" $ map wildToRegex ws
wildsRegex' (w:ws) "" = wildsRegex' ws (wildToRegex w)
wildsRegex' (w:ws) c = wildsRegex' ws (c ++ "|" ++ wildToRegex w)
{- filter out symlinks -} {- filter out symlinks -}
notSymlink :: FilePath -> IO Bool notSymlink :: FilePath -> IO Bool