From e895420eb58895bb3d10ef475d07dc84a28f6830 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <joshua.clayton@gmail.com>
Date: Thu, 5 May 2016 21:36:21 -0400
Subject: [PATCH] Use startProgress with incProgress instead of a state
 transformer

---
 src/Unused/CLI/SearchWithProgress.hs | 45 +++++++++-------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/Unused/CLI/SearchWithProgress.hs b/src/Unused/CLI/SearchWithProgress.hs
index 0112201..f890688 100644
--- a/src/Unused/CLI/SearchWithProgress.hs
+++ b/src/Unused/CLI/SearchWithProgress.hs
@@ -2,39 +2,22 @@ module Unused.CLI.SearchWithProgress
     ( searchWithProgressBar
     ) where
 
-import Control.Monad.State
-import System.ProgressBar
+import Control.Concurrent (ThreadId, killThread)
+import System.ProgressBar (ProgressRef, startProgress, incProgress, msg, percentage)
 import Unused.TermSearch (search)
 
 searchWithProgressBar :: [String] -> IO [String]
-searchWithProgressBar terms =
-    (concat . fst) <$> runStateT (performSearch $ length terms) terms
+searchWithProgressBar terms = do
+    (bar, tid) <- buildProgressBar $ toInteger $ length terms
+    concat <$> mapM (performSearch bar) terms <* killThread tid
 
-performSearch :: Int -> StateT [String] IO [[String]]
-performSearch total = do
-    currentTerm <- getSearchTerm
-    searchResults <- liftIO $ search currentTerm
+performSearch :: ProgressRef -> String -> IO [String]
+performSearch ref t =
+    search t <* incProgress ref 1
 
-    remainingTerms <- get
-    let remaining = length remainingTerms
-
-    liftIO $ printProgressBar (total - remaining) total
-
-    if remaining > 0
-        then do
-            res <- performSearch total
-            return $ searchResults:res
-        else return [searchResults]
-
-getSearchTerm :: StateT [String] IO String
-getSearchTerm = do
-    (x:xs) <- get
-    put xs
-    return x
-
-printProgressBar :: Int -> Int -> IO ()
-printProgressBar complete total = do
-    let message = "Working"
-    let progressBarWidth = 60
-
-    progressBar (msg message) percentage progressBarWidth (toInteger complete) (toInteger total)
+buildProgressBar :: Integer -> IO (ProgressRef, ThreadId)
+buildProgressBar =
+    startProgress (msg message) percentage progressBarWidth
+  where
+    message = "Working"
+    progressBarWidth = 60