summaryrefslogtreecommitdiff
path: root/Command/AddUrl.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-21 12:57:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-21 12:57:13 -0400
commit98194e4c61466ec9175e65af557b6130be81617d (patch)
treec58dfeb2d7c50548a1328948a5f23e9563c4e643 /Command/AddUrl.hs
parent4e7b407c066a46002011b99c7621c3a7cc3d7622 (diff)
addurl: Added --batch option.
Diffstat (limited to 'Command/AddUrl.hs')
-rw-r--r--Command/AddUrl.hs12
1 files changed, 10 insertions, 2 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index af2e04a62..de83d8c9b 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -32,6 +32,7 @@ import Annex.Content.Direct
import Annex.FileMatcher
import Logs.Location
import Utility.Metered
+import CmdLine.Batch
import qualified Annex.Transfer as Transfer
#ifdef WITH_QUVI
import Annex.Quvi
@@ -51,6 +52,7 @@ data AddUrlOptions = AddUrlOptions
, suffixOption :: Maybe String
, relaxedOption :: Bool
, rawOption :: Bool
+ , batchOption :: BatchMode
}
optParser :: CmdParamsDesc -> Parser AddUrlOptions
@@ -74,6 +76,7 @@ optParser desc = AddUrlOptions
))
<*> parseRelaxedOption
<*> parseRawOption
+ <*> parseBatchOption
parseRelaxedOption :: Parser Bool
parseRelaxedOption = switch
@@ -88,8 +91,13 @@ parseRawOption = switch
)
seek :: AddUrlOptions -> CommandSeek
-seek o = allowConcurrentOutput $
- forM_ (addUrls o) $ \u -> do
+seek o = allowConcurrentOutput $ do
+ forM_ (addUrls o) go
+ case batchOption o of
+ Batch -> batchSeek go
+ NoBatch -> noop
+ where
+ go u = do
r <- Remote.claimingUrl u
if Remote.uuid r == webUUID || rawOption o
then void $ commandAction $ startWeb o u