implement transferkeys plumbing command

4 files changed, 137 insertions, 2 deletions

diff --git a/Command/TransferKey.hs b/Command/TransferKey.hs
index 407c1d483..e2c926d40 100644
--- a/Command/TransferKey.hs
+++ b/Command/TransferKey.hs
@@ -1,4 +1,5 @@
-{- git-annex command, used internally by assistant
+{- git-annex command, used internally by old versions of assistant;
+ - kept around for now so running daemons don't break when upgraded
  -
  - Copyright 2012 Joey Hess <joey@kitenet.net>
  -
diff --git a/Command/TransferKeys.hs b/Command/TransferKeys.hs
new file mode 100644
index 000000000..61f99555d
--- /dev/null
+++ b/Command/TransferKeys.hs
@@ -0,0 +1,132 @@
+{- git-annex command, used internally by assistant
+ -
+ - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+
+module Command.TransferKeys where
+
+import Common.Annex
+import Command
+import Annex.Content
+import Logs.Location
+import Logs.Transfer
+import qualified Remote
+import Types.Remote (AssociatedFile)
+import Types.Key
+import qualified Option
+
+data TransferRequest = TransferRequest Direction Remote Key AssociatedFile
+
+def :: [Command]
+def = [withOptions options $
+	command "transferkeys" paramNothing seek "plumbing; transfers keys"]
+
+options :: [Option]
+options = [readFdOption, writeFdOption]
+
+readFdOption :: Option
+readFdOption = Option.field [] "readfd" paramNumber "read from this fd"
+
+writeFdOption :: Option
+writeFdOption = Option.field [] "writefd" paramNumber "write to this fd"
+
+seek :: [CommandSeek]
+seek = [withField readFdOption convertFd $ \readh ->
+	withField writeFdOption convertFd $ \writeh ->
+	withNothing $ start readh writeh]
+
+convertFd :: Maybe String -> Annex (Maybe Handle)
+convertFd Nothing = return Nothing
+convertFd (Just s) = liftIO $ do
+	case readish s of
+		Nothing -> error "bad fd"
+		Just fd -> Just <$> fdToHandle fd
+
+start :: Maybe Handle -> Maybe Handle -> CommandStart
+start readh writeh = do
+	runRequests (fromMaybe stdin readh) (fromMaybe stdout writeh) runner
+	stop
+  where
+	runner (TransferRequest direction remote key file)
+		| direction == Upload = 
+			upload (Remote.uuid remote) key file forwardRetry $ \p -> do
+				ok <- Remote.storeKey remote key file p
+				when ok $
+					Remote.logStatus remote key InfoPresent
+				return ok
+		| otherwise = download (Remote.uuid remote) key file forwardRetry $
+			getViaTmp key $ Remote.retrieveKeyFile remote key file
+
+runRequests
+	:: Handle
+	-> Handle
+	-> (TransferRequest -> Annex Bool)
+	-> Annex ()
+runRequests readh writeh a = go =<< readrequests
+  where
+  	go (d:u:k:f:rest) = do
+		case (deserialize d, deserialize u, deserialize k, deserialize f) of
+			(Just direction, Just uuid, Just key, Just file) -> do
+				mremote <- Remote.remoteFromUUID uuid
+				case mremote of
+					Nothing -> sendresult False
+					Just remote -> sendresult =<< a
+						(TransferRequest direction remote key file)
+			_ -> sendresult False
+		go rest
+	go [] = return ()
+	go _ = error "transferkeys protocol error"
+
+	readrequests = liftIO $ split fieldSep <$> hGetContents readh
+	sendresult b = liftIO $ do
+		hPutStrLn writeh $ serialize b
+		hFlush writeh
+
+sendRequest :: TransferRequest -> Handle -> IO ()
+sendRequest (TransferRequest d r k f) h = do
+	hPutStr h $ join fieldSep
+		[ serialize d
+		, serialize $ Remote.uuid r
+		, serialize k
+		, serialize f
+		]
+	hFlush h
+
+fieldSep :: String
+fieldSep = "\0"
+
+class Serialized a where
+	serialize :: a -> String
+	deserialize :: String -> Maybe a
+
+instance Serialized Bool where
+	serialize True = "1"
+	serialize False = "0"
+	deserialize "1" = Just True
+	deserialize "0" = Just False
+	deserialize _ = Nothing
+
+instance Serialized Direction where
+	serialize Upload = "u"
+	serialize Download = "d"
+	deserialize "u" = Just Upload
+	deserialize "d" = Just Download
+	deserialize _ = Nothing
+
+instance Serialized AssociatedFile where
+	serialize (Just f) = f
+	serialize Nothing = ""
+	deserialize "" = Just Nothing
+	deserialize f = Just $ Just f
+
+instance Serialized UUID where
+	serialize = fromUUID
+	deserialize = Just . toUUID
+
+instance Serialized Key where
+	serialize = key2file
+	deserialize = file2key
diff --git a/GitAnnex.hs b/GitAnnex.hs
index 78b374358..6a0139dce 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -31,6 +31,7 @@ import qualified Command.Get
 import qualified Command.FromKey
 import qualified Command.DropKey
 import qualified Command.TransferKey
+import qualified Command.TransferKeys
 import qualified Command.ReKey
 import qualified Command.Reinject
 import qualified Command.Fix
@@ -110,6 +111,7 @@ cmds = concat
 	, Command.FromKey.def
 	, Command.DropKey.def
 	, Command.TransferKey.def
+	, Command.TransferKeys.def
 	, Command.ReKey.def
 	, Command.Fix.def
 	, Command.Fsck.def
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 80002b414..751a34714 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -508,7 +508,7 @@ subdirectories).
 
 	git annex dropkey SHA1-s10-7da006579dd64330eb2456001fd01948430572f2
 
-* transferkey key
+* transferkeys
 
   This plumbing-level command is used by the assistant to transfer data.