mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid spawning file size polling thread when not in -J mode

Browse source
This commit is contained in:
Joey Hess 2015-11-16 21:21:58 -04:00
parent e97fce35a6
commit 3449c0e8ec
Failed to extract signature
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/Content.hs
View file

@ -660,10 +660,8 @@ saveState nocommit = doSideAction $ do
{- Downloads content from any of a list of urls. -}
downloadUrl :: Key -> MeterUpdate -> [Url.URLString] -> FilePath -> Annex Bool
downloadUrl k p urls file =
concurrentMetered (Just p) k $ \p' ->
watchFileSize file p' $
go =<< annexWebDownloadCommand <$> Annex.getGitConfig
downloadUrl k p urls file = concurrentMeteredFile file (Just p) k $
go =<< annexWebDownloadCommand <$> Annex.getGitConfig
where
go Nothing = do
a <- ifM commandProgressDisabled

10
Messages/Progress.hs
View file

@ -70,7 +70,15 @@ concurrentMetered :: Maybe MeterUpdate -> Key -> (MeterUpdate -> Annex a) -> Ann
concurrentMetered combinemeterupdate key a = withOutputType go
where
go (ConcurrentOutput _) = metered combinemeterupdate key a
go _ = a (fromMaybe (const noop) combinemeterupdate)
go _ = a (fromMaybe nullMeterUpdate combinemeterupdate)
{- Poll file size to display meter, but only for concurrent output. -}
concurrentMeteredFile :: FilePath -> Maybe MeterUpdate -> Key -> Annex a -> Annex a
concurrentMeteredFile file combinemeterupdate key a = withOutputType go
where
go (ConcurrentOutput _) = metered combinemeterupdate key $ \p ->
watchFileSize file p a
go _ = a
{- Progress dots. -}
showProgressDots :: Annex ()