refactor

2 files changed, 5 insertions, 13 deletions

diff --git a/CmdLine/Batch.hs b/CmdLine/Batch.hs
index ce9127975..f07f79b04 100644
--- a/CmdLine/Batch.hs
+++ b/CmdLine/Batch.hs
@@ -31,15 +31,7 @@ batchable handler parser paramdesc = batchseeker <$> batchparser
 		<*> cmdParams paramdesc
 	
 	batchseeker (opts, NoBatch, params) = mapM_ (go NoBatch opts) params
-	batchseeker (opts, Batch, _) = batchloop opts
-
-	batchloop opts = do
-		mp <- liftIO $ catchMaybeIO getLine
-		case mp of
-			Nothing -> return ()
-			Just p -> do
-				go Batch opts p
-				batchloop opts
+	batchseeker (opts, Batch, _) = batchInput (go Batch opts)
 
 	go batchmode opts p =
 		unlessM (handler opts p) $
@@ -52,11 +44,11 @@ batchBadInput NoBatch = liftIO exitFailure
 batchBadInput Batch = liftIO $ putStrLn ""
 
 -- Reads lines of batch mode input and passes to the action to handle.
-batchSeek :: (String -> Annex ()) -> Annex ()
-batchSeek a = do
+batchInput :: (String -> Annex ()) -> Annex ()
+batchInput a = do
 	mp <- liftIO $ catchMaybeIO getLine
 	case mp of
 		Nothing -> return ()
 		Just p -> do
 			a p
-			batchSeek a
+			batchInput a
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index de83d8c9b..0af7344ed 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -94,7 +94,7 @@ seek :: AddUrlOptions -> CommandSeek
 seek o = allowConcurrentOutput $ do
 	forM_ (addUrls o) go
 	case batchOption o of
-		Batch -> batchSeek go
+		Batch -> batchInput go
 		NoBatch -> noop
   where
 	go u = do