converted ContentLocation, ExampleKey, LookupKey

3 files changed, 28 insertions, 31 deletions

diff --git a/Command/ContentLocation.hs b/Command/ContentLocation.hs
index bca73f926..8a5eaa7a9 100644
--- a/Command/ContentLocation.hs
+++ b/Command/ContentLocation.hs
@@ -11,21 +11,20 @@ import Common.Annex
 import Command
 import CmdLine.Batch
 import Annex.Content
+import Types.Key
 
 cmd :: Command
-cmd = withOptions [batchOption] $ noCommit $ noMessages $
+cmd = noCommit $ noMessages $
 	command "contentlocation" SectionPlumbing 
 		"looks up content for a key"
-		(paramRepeating paramKey) (withParams seek)
+		(paramRepeating paramKey)
+		(batchable run (pure ()))
 
-seek :: CmdParams -> CommandSeek
-seek = batchable withKeys start
-
-start :: Batchable Key
-start batchmode k = do
-	maybe (batchBadInput batchmode) (liftIO . putStrLn)
+run :: () -> String -> Annex Bool
+run _ p = do
+	let k = fromMaybe (error "bad key") $ file2key p
+	maybe (return False) (\f -> liftIO (putStrLn f) >> return True)
 		=<< inAnnex' (pure True) Nothing check k
-	stop
   where
 	check f = ifM (liftIO (doesFileExist f))
 		( return (Just f)
diff --git a/Command/ExamineKey.hs b/Command/ExamineKey.hs
index e0a1d9747..55f72f71b 100644
--- a/Command/ExamineKey.hs
+++ b/Command/ExamineKey.hs
@@ -11,21 +11,18 @@ import Common.Annex
 import Command
 import CmdLine.Batch
 import qualified Utility.Format
-import Command.Find (FindOptions(..), showFormatted, keyVars)
+import Command.Find (parseFormatOption, showFormatted, keyVars)
 import Types.Key
 
 cmd :: Command
-cmd = noCommit $ noMessages $ withOptions [formatOption, jsonOption, batchOption] $
+cmd = noCommit $ noMessages $ withGlobalOptions [jsonOption] $
 	command "examinekey" SectionPlumbing 
 		"prints information from a key"
-		(paramRepeating paramKey) (withParams seek)
+		(paramRepeating paramKey)
+		(batchable run (optional parseFormatOption))
 
-seek :: CmdParams -> CommandSeek
-seek ps = do
-	format <- getFormat
-	batchable withKeys (start format) ps
-
-start :: Maybe Utility.Format.Format -> Batchable Key
-start format _ key = do
-	showFormatted format (key2file key) (keyVars key)
-	stop
+run :: Maybe Utility.Format.Format -> String -> Annex Bool
+run format p = do
+	let k = fromMaybe (error "bad key") $ file2key p
+	showFormatted format (key2file k) (keyVars k)
+	return True
diff --git a/Command/LookupKey.hs b/Command/LookupKey.hs
index 021dc963b..54023eab7 100644
--- a/Command/LookupKey.hs
+++ b/Command/LookupKey.hs
@@ -14,16 +14,17 @@ import Annex.CatFile
 import Types.Key
 
 cmd :: Command
-cmd = withOptions [batchOption] $ notBareRepo $ noCommit $ noMessages $
+cmd = notBareRepo $ noCommit $ noMessages $
 	command "lookupkey" SectionPlumbing 
 		"looks up key used for file"
-		(paramRepeating paramFile) (withParams seek)
+		(paramRepeating paramFile)
+		(batchable run (pure ()))
 
-seek :: CmdParams -> CommandSeek
-seek = batchable withStrings start
-
-start :: Batchable String
-start batchmode file = do
-	maybe (batchBadInput batchmode) (liftIO . putStrLn . key2file)
-		=<< catKeyFile file
-	stop
+run :: () -> String -> Annex Bool
+run _ file = do
+	mk <- catKeyFile file
+	case mk of
+		Just k  -> do
+			liftIO $ putStrLn $ key2file k
+			return True
+		Nothing -> return False