add routes to pause/start/cancel transfers

This commit includes a paydown on technical debt incurred two years ago,
when I didn't know that it was bad to make custom Read and Show instances
for types. As the routes need Read and Show for Transfer, which includes a
Key, and deriving my own Read instance of key was not practical,
I had to finally clean that up.

So the compact Key read and show functions are now file2key and key2file,
and Read and Show are now derived instances.

Changed all code that used the old instances, compiler checked.
(There were a few places, particularly in Command.Unused, and the test
suite where the Show instance continue to be used for legitimate
comparisons; ie show key_x == show key_y (though really in a bloom filter))

4 files changed, 9 insertions, 7 deletions

diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 83739a3e1..56b8071ee 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -13,6 +13,7 @@ import System.Process
 
 import Common.Annex
 import Types.Remote
+import Types.Key
 import qualified Git
 import qualified Git.Command
 import qualified Git.Config
@@ -243,7 +244,7 @@ bupRef k
 	| Git.Ref.legal True shown = shown
 	| otherwise = "git-annex-" ++ showDigest (sha256 (fromString shown))
 	where
-		shown = show k
+		shown = key2file k
 
 bupLocal :: BupRepo -> Bool
 bupLocal = notElem ':'
diff --git a/Remote/Git.hs b/Remote/Git.hs
index f42a1d536..f12ef2fc7 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -183,7 +183,7 @@ inAnnex r key
 						v -> return v
 		checkremote = do
 			showAction $ "checking " ++ Git.repoDescribe r
-			onRemote r (check, unknown) "inannex" [Param (show key)] []
+			onRemote r (check, unknown) "inannex" [Param (key2file key)] []
 			where
 				check c p = dispatch <$> safeSystem c p
 				dispatch ExitSuccess = Right True
@@ -228,7 +228,7 @@ dropKey r key
 	| Git.repoIsHttp r = error "dropping from http repo not supported"
 	| otherwise = commitOnCleanup r $ onRemote r (boolSystem, False) "dropkey"
 		[ Params "--quiet --force"
-		, Param $ show key
+		, Param $ key2file key
 		]
 		[]
 
@@ -310,7 +310,7 @@ rsyncParamsRemote r sending key file afile = do
 		: maybe [] (\f -> [(Fields.associatedFile, f)]) afile
 	Just (shellcmd, shellparams) <- git_annex_shell r
 		(if sending then "sendkey" else "recvkey")
-		[ Param $ show key ]
+		[ Param $ key2file key ]
 		fields
 	-- Convert the ssh command into rsync command line.
 	let eparam = rsyncShell (Param shellcmd:shellparams)
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index 9af851d14..5856b2a02 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -13,6 +13,7 @@ import System.Environment
 
 import Common.Annex
 import Types.Remote
+import Types.Key
 import qualified Git
 import Config
 import Annex.Content
@@ -68,7 +69,7 @@ hookEnv k f = Just <$> mergeenv (fileenv f ++ keyenv)
 				<$> M.fromList <$> getEnvironment
 		env s v = ("ANNEX_" ++ s, v)
 		keyenv =
-			[ env "KEY" (show k)
+			[ env "KEY" (key2file k)
 			, env "HASH_1" (hashbits !! 0)
 			, env "HASH_2" (hashbits !! 1)
 			]
@@ -133,7 +134,7 @@ checkPresent r h k = do
 	v <- lookupHook h "checkpresent"
 	liftIO $ catchMsgIO $ check v
 	where
-		findkey s = show k `elem` lines s
+		findkey s = key2file k `elem` lines s
 		check Nothing = error "checkpresent hook misconfigured"
 		check (Just hook) = do
 			env <- hookEnv k Nothing
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 6e249ec4d..7dbd096f7 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -211,7 +211,7 @@ s3Action r noconn action = do
 		_ -> return noconn
 
 bucketFile :: Remote -> Key -> FilePath
-bucketFile r = munge . show
+bucketFile r = munge . key2file
 	where
 		munge s = case M.lookup "mungekeys" $ fromJust $ config r of
 			Just "ia" -> iaMunge s