remove checksum from WORM

with size and mtime in the key, it's redundant
This commit is contained in:
Joey Hess 2010-10-17 00:33:05 -04:00
parent c57b1a697c
commit a0b040524a
2 changed files with 9 additions and 18 deletions

View file

@ -6,7 +6,6 @@ module Backend.WORM (backend) where
import Control.Monad.State import Control.Monad.State
import System.FilePath import System.FilePath
import System.Posix.Files import System.Posix.Files
import Data.Digest.Pure.SHA -- slow, but we only checksum filenames
import qualified Data.ByteString.Lazy.Char8 as B import qualified Data.ByteString.Lazy.Char8 as B
import qualified Backend.File import qualified Backend.File
@ -18,25 +17,18 @@ backend = Backend.File.backend {
getKey = keyValue getKey = keyValue
} }
-- A SHA1 of the basename of the filename, plus the file size and -- The key is formed from the file size, modification time, and the
-- modification time, is used as the unique part of the key. That -- basename of the filename.
-- allows multiple files with the same names to have different keys, --
-- That allows multiple files with the same names to have different keys,
-- while also allowing a file to be moved around while retaining the -- while also allowing a file to be moved around while retaining the
-- same key. -- same key.
--
-- The file size and modification time are also included in the key,
-- unhashed. This could be used as a sanity check.
--
-- The basename of the filename is also included in the key, so it's clear
-- what the original filename was when a user sees the value.
keyValue :: FilePath -> Annex (Maybe Key) keyValue :: FilePath -> Annex (Maybe Key)
keyValue file = do keyValue file = do
stat <- liftIO $ getFileStatus file stat <- liftIO $ getFileStatus file
return $ Just $ Key ((name backend), key stat) return $ Just $ Key ((name backend), key stat)
where where
key stat = (checksum $ uniqueid stat) ++ sep ++ key stat = uniqueid stat ++ sep ++ base
uniqueid stat ++ sep ++ base
checksum s = show $ sha1 $ B.pack s
uniqueid stat = (show $ modificationTime stat) ++ sep ++ uniqueid stat = (show $ modificationTime stat) ++ sep ++
(show $ fileSize stat) (show $ fileSize stat)
base = takeFileName file base = takeFileName file

View file

@ -54,10 +54,7 @@ options = [
findWanted :: CmdWants -> [String] -> Git.Repo -> IO [String] findWanted :: CmdWants -> [String] -> Git.Repo -> IO [String]
findWanted FilesNotInGit params repo = do findWanted FilesNotInGit params repo = do
files <- mapM (Git.notInRepo repo) params files <- mapM (Git.notInRepo repo) params
return $ filter notstate $ foldl (++) [] files return $ foldl (++) [] files
where
-- never include files in the state directory
notstate f = stateLoc /= take (length stateLoc) f
findWanted FilesInGit params repo = do findWanted FilesInGit params repo = do
files <- mapM (Git.inRepo repo) params files <- mapM (Git.inRepo repo) params
return $ foldl (++) [] files return $ foldl (++) [] files
@ -82,8 +79,10 @@ parseCmd argv state = do
[Command _ action want] -> do [Command _ action want] -> do
f <- findWanted want (drop 1 params) f <- findWanted want (drop 1 params)
(BackendTypes.repo state) (BackendTypes.repo state)
return (flags, map action f) return (flags, map action $ filter notstate f)
where where
-- never include files from the state directory
notstate f = stateLoc /= take (length stateLoc) f
getopt = case getOpt Permute options argv of getopt = case getOpt Permute options argv of
(flags, params, []) -> return (flags, params) (flags, params, []) -> return (flags, params)
(_, _, errs) -> ioError (userError (concat errs ++ usage)) (_, _, errs) -> ioError (userError (concat errs ++ usage))