avoid progress bar for url download with --quiet

This commit is contained in:
Joey Hess 2015-04-03 20:38:56 -04:00
parent b2ad3403c6
commit ff2eeaf054
2 changed files with 30 additions and 10 deletions

View file

@ -49,20 +49,34 @@ showProgressDots :: Annex ()
showProgressDots = handleMessage q $
flushed $ putStr "."
{- Runs a command, that normally outputs progress to the specified handle.
-
- In quiet mode, normal output is suppressed. stderr is fed through the
- mkStderrEmitter. If the progress is output to stderr, then stderr is
- dropped, unless the command fails in which case the last line of output
- to stderr will be shown.
-}
progressCommand :: Handle -> FilePath -> [CommandParam] -> Annex Bool
progressCommand progresshandle cmd params = undefined
mkProgressHandler :: MeterUpdate -> Annex ProgressHandler
mkProgressHandler meter = ProgressHandler
<$> quietmode
<$> commandProgressDisabled
<*> (stderrhandler <$> mkStderrEmitter)
<*> pure meter
where
quietmode = withOutputType $ \t -> return $ case t of
QuietOutput -> True
ProgressOutput -> True
_ -> False
stderrhandler emitter h = unlessM (hIsEOF h) $ do
void $ emitter =<< hGetLine h
stderrhandler emitter h
{- Should commands that normally output progress messages have that
- output disabled? -}
commandProgressDisabled :: Annex Bool
commandProgressDisabled = withOutputType $ \t -> return $ case t of
QuietOutput -> True
ProgressOutput -> True
_ -> False
{- Generates an IO action that can be used to emit stderr.
-
- When a progress meter is displayed, this takes care to avoid