NorfairKing/feedback
1
1
Fork 0
mirror of https://github.com/NorfairKing/feedback.git synced 2024-11-27 00:47:13 +03:00
Code Issues Projects Releases Wiki Activity

Show a 'Done.' indicator when exiting a loop to definitely reset the terminal colour

Browse Source
This commit is contained in:
Tom Sydney Kerckhove 2022-10-22 20:47:07 +02:00
parent 306d105111
commit 8c7f4f44af
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
feedback/src/Feedback/Common/Output.hs
View File

@ -22,6 +22,9 @@ putTimedChunks terminalCapabilities chunks = do
let timeChunk = fore yellow $ chunk $ T.pack $ formatTime defaultTimeLocale "%H:%M:%S" now let timeChunk = fore yellow $ chunk $ T.pack $ formatTime defaultTimeLocale "%H:%M:%S" now
putChunksLocaleWith terminalCapabilities $ timeChunk : " " : chunks ++ ["\n"] putChunksLocaleWith terminalCapabilities $ timeChunk : " " : chunks ++ ["\n"]
putDone :: TerminalCapabilities -> IO ()
putDone terminalCapabilities = putTimedChunks terminalCapabilities [indicatorChunk "Done."]
indicatorChunk :: String -> Chunk indicatorChunk :: String -> Chunk
indicatorChunk = fore cyan . chunk . T.pack . printf "%-10s" indicatorChunk = fore cyan . chunk . T.pack . printf "%-10s"

5
feedback/src/Feedback/Loop.hs
View File

@ -39,10 +39,10 @@ runFeedbackLoop = do
here <- getCurrentDir here <- getCurrentDir
mStdinFiles <- getStdinFiles here mStdinFiles <- getStdinFiles here
terminalCapabilities <- getTermCaps terminalCapabilities <- getTermCaps
forever $ do let singleIteration = do
-- We show a 'preparing' chunk before we get the settings because sometimes -- We show a 'preparing' chunk before we get the settings because sometimes
-- getting the settings can take a while, for example in big repositories. -- getting the settings can take a while, for example in big repositories.
putTimedChunks terminalCapabilities [indicatorChunk "preparing"] putTimedChunks terminalCapabilities [indicatorChunk "Preparing"]
LoopSettings {..} <- getLoopSettings LoopSettings {..} <- getLoopSettings
-- 0.1 second debouncing, 0.001 was too little -- 0.1 second debouncing, 0.001 was too little
let conf = FS.defaultConfig {confDebounce = Debounce 0.1} let conf = FS.defaultConfig {confDebounce = Debounce 0.1}
@ -60,6 +60,7 @@ runFeedbackLoop = do
(processWorker loopSettingRunSettings eventChan outputChan) (processWorker loopSettingRunSettings eventChan outputChan)
(outputWorker terminalCapabilities loopSettingOutputSettings outputChan) (outputWorker terminalCapabilities loopSettingOutputSettings outputChan)
stopListeningAction stopListeningAction
forever singleIteration `finally` putDone terminalCapabilities
#ifdef MIN_VERSION_safe_coloured_text_terminfo #ifdef MIN_VERSION_safe_coloured_text_terminfo
getTermCaps :: IO TerminalCapabilities getTermCaps :: IO TerminalCapabilities