summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Backend.hs18
-rw-r--r--Backend/SHA.hs13
-rw-r--r--Backend/URL.hs10
-rw-r--r--Backend/WORM.hs18
-rw-r--r--Command/Add.hs7
-rw-r--r--Command/AddUrl.hs7
-rw-r--r--Command/Migrate.hs26
-rw-r--r--Types/Backend.hs13
-rw-r--r--doc/design/assistant/inotify.mdwn4
9 files changed, 59 insertions, 57 deletions
diff --git a/Backend.hs b/Backend.hs
index fa3266944..bde1aad78 100644
--- a/Backend.hs
+++ b/Backend.hs
@@ -6,6 +6,7 @@
-}
module Backend (
+ B.KeySource(..),
list,
orderedList,
genKey,
@@ -51,18 +52,19 @@ orderedList = do
parseBackendList s = map lookupBackendName $ words s
{- Generates a key for a file, trying each backend in turn until one
- - accepts it. -}
-genKey :: FilePath -> Maybe Backend -> Annex (Maybe (Key, Backend))
-genKey file trybackend = do
+ - accepts it.
+ -}
+genKey :: B.KeySource -> Maybe Backend -> Annex (Maybe (Key, Backend))
+genKey source trybackend = do
bs <- orderedList
let bs' = maybe bs (: bs) trybackend
- genKey' bs' file
-genKey' :: [Backend] -> FilePath -> Annex (Maybe (Key, Backend))
+ genKey' bs' source
+genKey' :: [Backend] -> B.KeySource -> Annex (Maybe (Key, Backend))
genKey' [] _ = return Nothing
-genKey' (b:bs) file = do
- r <- B.getKey b file
+genKey' (b:bs) source = do
+ r <- B.getKey b source
case r of
- Nothing -> genKey' bs file
+ Nothing -> genKey' bs source
Just k -> return $ Just (makesane k, b)
where
-- keyNames should not contain newline characters.
diff --git a/Backend/SHA.hs b/Backend/SHA.hs
index c2a6cf976..df613bbcd 100644
--- a/Backend/SHA.hs
+++ b/Backend/SHA.hs
@@ -69,9 +69,10 @@ shaN size file = do
command = fromJust $ shaCommand size
{- A key is a checksum of its contents. -}
-keyValue :: SHASize -> FilePath -> Annex (Maybe Key)
-keyValue size file = do
- s <- shaN size file
+keyValue :: SHASize -> KeySource -> Annex (Maybe Key)
+keyValue size source = do
+ let file = contentLocation source
+ s <- shaN size file
stat <- liftIO $ getFileStatus file
return $ Just $ stubKey
{ keyName = s
@@ -80,14 +81,14 @@ keyValue size file = do
}
{- Extension preserving keys. -}
-keyValueE :: SHASize -> FilePath -> Annex (Maybe Key)
-keyValueE size file = keyValue size file >>= maybe (return Nothing) addE
+keyValueE :: SHASize -> KeySource -> Annex (Maybe Key)
+keyValueE size source = keyValue size source >>= maybe (return Nothing) addE
where
addE k = return $ Just $ k
{ keyName = keyName k ++ extension
, keyBackendName = shaNameE size
}
- naiveextension = takeExtension file
+ naiveextension = takeExtension $ keyFilename source
extension
-- long or newline containing extensions are
-- probably not really an extension
diff --git a/Backend/URL.hs b/Backend/URL.hs
index b98974cb4..cc9112a36 100644
--- a/Backend/URL.hs
+++ b/Backend/URL.hs
@@ -20,11 +20,11 @@ backends :: [Backend]
backends = [backend]
backend :: Backend
-backend = Backend {
- name = "URL",
- getKey = const (return Nothing),
- fsckKey = Nothing
-}
+backend = Backend
+ { name = "URL"
+ , getKey = const $ return Nothing
+ , fsckKey = Nothing
+ }
fromUrl :: String -> Maybe Integer -> Key
fromUrl url size = stubKey
diff --git a/Backend/WORM.hs b/Backend/WORM.hs
index c022fd413..630000fa2 100644
--- a/Backend/WORM.hs
+++ b/Backend/WORM.hs
@@ -15,11 +15,11 @@ backends :: [Backend]
backends = [backend]
backend :: Backend
-backend = Backend {
- name = "WORM",
- getKey = keyValue,
- fsckKey = Nothing
-}
+backend = Backend
+ { name = "WORM"
+ , getKey = keyValue
+ , fsckKey = Nothing
+ }
{- The key includes the file size, modification time, and the
- basename of the filename.
@@ -28,11 +28,11 @@ backend = Backend {
- while also allowing a file to be moved around while retaining the
- same key.
-}
-keyValue :: FilePath -> Annex (Maybe Key)
-keyValue file = do
- stat <- liftIO $ getFileStatus file
+keyValue :: KeySource -> Annex (Maybe Key)
+keyValue source = do
+ stat <- liftIO $ getFileStatus $ contentLocation source
return $ Just Key {
- keyName = takeFileName file,
+ keyName = takeFileName $ keyFilename source,
keyBackendName = name backend,
keySize = Just $ fromIntegral $ fileSize stat,
keyMtime = Just $ modificationTime stat
diff --git a/Command/Add.hs b/Command/Add.hs
index ef839b2a3..7029a9c16 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -12,7 +12,7 @@ import Annex.Exception
import Command
import qualified Annex
import qualified Annex.Queue
-import qualified Backend
+import Backend
import Logs.Location
import Annex.Content
import Utility.Touch
@@ -46,8 +46,9 @@ start file = notBareRepo $ ifAnnexed file fixup add
perform :: FilePath -> CommandPerform
perform file = do
- backend <- Backend.chooseBackend file
- Backend.genKey file backend >>= go
+ let source = KeySource { keyFilename = file, contentLocation = file}
+ backend <- chooseBackend file
+ genKey source backend >>= go
where
go Nothing = stop
go (Just (key, _)) = do
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 089606e85..87b24149d 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -11,7 +11,7 @@ import Network.URI
import Common.Annex
import Command
-import qualified Backend
+import Backend
import qualified Command.Add
import qualified Annex
import qualified Backend.URL
@@ -72,8 +72,9 @@ download url file = do
tmp <- fromRepo $ gitAnnexTmpLocation dummykey
liftIO $ createDirectoryIfMissing True (parentDir tmp)
stopUnless (downloadUrl [url] tmp) $ do
- backend <- Backend.chooseBackend file
- k <- Backend.genKey tmp backend
+ backend <- chooseBackend file
+ let source = KeySource { keyFilename = file, contentLocation = file}
+ k <- genKey source backend
case k of
Nothing -> stop
Just (key, _) -> do
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 6e28c4b52..29e664ce2 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -9,7 +9,7 @@ module Command.Migrate where
import Common.Annex
import Command
-import qualified Backend
+import Backend
import qualified Types.Key
import Annex.Content
import qualified Command.ReKey
@@ -23,14 +23,14 @@ seek = [withFilesInGit $ whenAnnexed start]
start :: FilePath -> (Key, Backend) -> CommandStart
start file (key, oldbackend) = do
exists <- inAnnex key
- newbackend <- choosebackend =<< Backend.chooseBackend file
+ newbackend <- choosebackend =<< chooseBackend file
if (newbackend /= oldbackend || upgradableKey key) && exists
then do
showStart "migrate" file
next $ perform file key newbackend
else stop
where
- choosebackend Nothing = Prelude.head <$> Backend.orderedList
+ choosebackend Nothing = Prelude.head <$> orderedList
choosebackend (Just backend) = return backend
{- Checks if a key is upgradable to a newer representation. -}
@@ -40,25 +40,13 @@ upgradableKey key = isNothing $ Types.Key.keySize key
{- Store the old backend's key in the new backend
- The old backend's key is not dropped from it, because there may
- - be other files still pointing at that key.
- -
- - Use the same filename as the file for the temp file name, to support
- - backends that allow the filename to influence the keys they
- - generate.
- -}
+ - be other files still pointing at that key. -}
perform :: FilePath -> Key -> Backend -> CommandPerform
perform file oldkey newbackend = maybe stop go =<< genkey
where
go newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $
next $ Command.ReKey.cleanup file oldkey newkey
genkey = do
- src <- inRepo $ gitAnnexLocation oldkey
- tmp <- fromRepo gitAnnexTmpDir
- let tmpfile = tmp </> takeFileName file
- cleantmp tmpfile
- liftIO $ createLink src tmpfile
- newkey <- liftM fst <$>
- Backend.genKey tmpfile (Just newbackend)
- cleantmp tmpfile
- return newkey
- cleantmp t = liftIO $ whenM (doesFileExist t) $ removeFile t
+ content <- inRepo $ gitAnnexLocation oldkey
+ let source = KeySource { keyFilename = file, contentLocation = content }
+ liftM fst <$> genKey source (Just newbackend)
diff --git a/Types/Backend.hs b/Types/Backend.hs
index d52cec547..5abb0896d 100644
--- a/Types/Backend.hs
+++ b/Types/Backend.hs
@@ -2,7 +2,7 @@
-
- Most things should not need this, using Types instead
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@@ -11,11 +11,18 @@ module Types.Backend where
import Types.Key
+{- The source used to generate a key. The location of the content
+ - may be different from the filename associated with the key. -}
+data KeySource = KeySource
+ { keyFilename :: FilePath
+ , contentLocation :: FilePath
+ }
+
data BackendA a = Backend {
-- name of this backend
name :: String,
- -- converts a filename to a key
- getKey :: FilePath -> a (Maybe Key),
+ -- gets the key to use for a given content
+ getKey :: KeySource -> a (Maybe Key),
-- called during fsck to check a key, if the backend has its own checks
fsckKey :: Maybe (Key -> FilePath -> a Bool)
}
diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn
index 3263c476d..ca63a1c82 100644
--- a/doc/design/assistant/inotify.mdwn
+++ b/doc/design/assistant/inotify.mdwn
@@ -61,7 +61,9 @@ Many races need to be dealt with by this code. Here are some of them.
**Currently unfixed**; The new content will be moved to the annex under the
old checksum, and fsck will later catch this inconsistency.
- Possible fix: Move content someplace before doing checksumming.
+ Possible fix: Move content someplace before doing checksumming. Perhaps
+ using a hard link and removing the write bit to prevent modification
+ while checksumming.
* File is added and then replaced with another file before the annex add
makes its symlink.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 09:50:43 +0000