From 563e5613f28710d2e2dd56b0f06ef2714e9a14d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Dec 2015 14:03:10 -0400 Subject: smudge filter working --- Command/Smudge.hs | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Command/Smudge.hs b/Command/Smudge.hs index 22f9efd69..dc618d36e 100644 --- a/Command/Smudge.hs +++ b/Command/Smudge.hs @@ -9,9 +9,9 @@ module Command.Smudge where import Common.Annex import Command -import Annex.Content -import Annex.Link -import Git.Types +import Types.Key + +import qualified Data.ByteString.Lazy as B cmd :: Command cmd = dontCheck repoExists $ @@ -23,7 +23,25 @@ seek :: CmdParams -> CommandSeek seek = withWords start start :: [String] -> CommandStart -start [file] = do - error ("smudge " ++ file) +start [_file] = do + liftIO $ fileEncoding stdin + s <- liftIO $ hGetContents stdin + case parsePointer s of + Nothing -> liftIO $ putStr s + Just k -> do + content <- calcRepo (gitAnnexLocation k) + liftIO $ maybe + (putStr s) + (B.hPut stdout) + =<< catchMaybeIO (B.readFile content) + stop start [] = error "smudge filter run without filename; upgrade git" start _ = error "smudge filter passed multiple filenames" + +parsePointer :: String -> Maybe Key +parsePointer s + | length s' >= maxsz = Nothing -- too long to be a key pointer + | otherwise = headMaybe (lines s') >>= file2key + where + s' = take maxsz s + maxsz = 81920 -- cgit v1.2.3