Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Improving the progress tracking API #777

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Improving the progress tracking API #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3712533
attempting a better progress tracking API
saurabhnanda Sep 29, 2020
780aec4
bugfix
saurabhnanda Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Development/Shake.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module Development.Shake(
-- ** Targets
getTargets, addTarget, withTargetDocs, withoutTargets,
-- ** Progress reporting
Progress(..), progressSimple, progressDisplay, progressTitlebar, progressProgram, getProgress,
Progress(..), progressSimple, progressDisplay, progressTitlebar, progressProgram, getProgress, progressTracker,
-- ** Verbosity
Verbosity(..), getVerbosity, putVerbose, putInfo, putWarn, putError, withVerbosity, quietly,
-- * Running commands
Expand Down
13 changes: 12 additions & 1 deletion src/Development/Shake/Internal/Progress.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- | Progress tracking
module Development.Shake.Internal.Progress(
progress,
progressSimple, progressDisplay, progressTitlebar, progressProgram,
progressSimple, progressDisplay, progressTitlebar, progressProgram, progressTracker,
ProgressEntry(..), progressReplay, writeProgressReport -- INTERNAL USE ONLY
) where

Expand Down Expand Up @@ -227,6 +227,17 @@ progressDisplay sample disp prog = do
maybe "" (", Failure! " ++) (isFailure p)
loop time mealy

progressTracker :: Double -> (Progress -> IO ()) -> IO Progress -> IO ()
progressTracker sample progHandler prog = do
catchJust (\x -> if x == ThreadKilled then Just () else Nothing) go errHandler
where
go = do
p <- prog
progHandler p
sleep sample
go
errHandler = const $ prog >>= progHandler


data ProgressEntry = ProgressEntry
{idealSecs :: Double, idealPerc :: Double
Expand Down