refactor part 2

Author: tusharad

src/MyGrep/Common/Utils.hs

@@ -18,4 +18,4 @@ fancyPrint rLine = T.putStrLn $ fileName <> "\t:: " <> lineNumber' <> "\t" <> li
         line' = renderChunkText With8Colours $ fore brightYellow $ chunk $ getL rLine
         fName = fromMaybe "" (file rLine)
         lName = maybe "" show (lineNumber rLine)
-        getL rLine_@ResultLine{line=ll} = ll
+        getL ResultLine{line=ll} = ll

src/MyGrep/Core.hs

@@ -5,7 +5,6 @@
 module MyGrep.Core where
 
 import           MyGrep.Common.Types
-import           MyGrep.Common.Utils
 import           MyGrep.Search
 import qualified System.Environment as Env
 import qualified Data.Text as T
@@ -47,6 +46,4 @@ main' = do
   eArg <- parseArguments
   case eArg of
     Left err -> T.putStrLn $ "Error: " <> getError err
-    Right arg -> do
-      res <- search arg
-      mapM_ fancyPrint res
+    Right arg -> search arg

src/MyGrep/Search.hs

@@ -2,7 +2,7 @@
 module MyGrep.Search (search) where
 
 import           MyGrep.Common.Types
-import           MyGrep.Common.Utils (trim)
+import           MyGrep.Common.Utils (trim,fancyPrint)
 import qualified Data.Text.IO as T
 import qualified Data.Text as T
 import           System.Directory
@@ -11,38 +11,48 @@ import           Data.Maybe (fromMaybe)
 import           Control.Exception
 import           System.FilePath
 
-search :: Args -> IO [ResultLine]
+search :: Args -> IO ()
 search Args{..} = do
   case searchLocationType of
         File      -> searchInFile $ fromMaybe "" searchLocation
         Directory -> searchInDirectory $ fromMaybe "" searchLocation
-        STDIN     -> searchString 0 "" . T.lines <$> T.getContents
-        _         -> pure [] -- impossible case
+        STDIN     -> T.getContents >>= (\content -> searchString 0 "" (T.lines content))
   where
-      searchInDirectory :: FilePath -> IO [ResultLine]
+      searchInDirectory :: FilePath -> IO ()
       searchInDirectory searchLocation' = do
         files_ <- listDirectory searchLocation'
         let files = filter (\x -> head x /= '.') files_   -- filtering out hidden directories
-        mconcat $ map (\file -> do
-          res <- doesDirectoryExist (searchLocation' </> file)
-          (if res then searchInDirectory (searchLocation' </> file) else searchInFile (searchLocation' </> file))
-          ) files
+        mapM_ go files
+        where 
+          go :: FilePath -> IO ()
+          go fp = do
+            let fullPath = searchLocation' </> fp
+            doesDirectoryExist fullPath >>= (\isDir -> if isDir then searchInDirectory fullPath 
+              else searchInFile fullPath)
 
-      searchInFile :: FilePath -> IO [ResultLine]
+      searchInFile :: FilePath -> IO ()
       searchInFile fileName = do
-        eContent <- try $ T.lines <$> T.readFile fileName :: IO (Either IOError [T.Text])
+        eContent <- try $ T.lines <$> T.readFile fileName 
+          :: IO (Either IOError [T.Text])
         case eContent of
-          Left _        -> pure [] -- print (e :: IOError)
-          Right content -> pure $ searchString 0  fileName content
+          Left _        -> pure () -- print (e :: IOError)
+          Right content -> searchString 0 fileName content
 
-      searchString :: Int -> FilePath -> [T.Text] -> [ResultLine]
-      searchString _ _ [] = []
+      searchString :: Int -> FilePath -> [T.Text] -> IO ()
+      searchString _ _ [] = pure ()
       searchString n fileName (hayStack:hayStacks) = do
-        let res = if CaseInSensitive `elem` flags then indices (T.toLower searchTerm) (T.toLower hayStack) else indices searchTerm hayStack
+        let res = if CaseInSensitive `elem` flags 
+            then indices (T.toLower searchTerm) (T.toLower hayStack) 
+            else indices searchTerm hayStack
         case res of
             [] -> searchString (n+1) fileName hayStacks
-            _  -> ResultLine {
-                    file=Just fileName
-                  , lineNumber=if LineNumber `elem` flags then Just n else Nothing
-                  , line=trim hayStack
-                } : searchString (n+1) fileName hayStacks
+            _  -> do
+              let 
+                resultLine = ResultLine {
+                                file=Just fileName
+                              , lineNumber= if LineNumber `elem` flags 
+                                then Just n else Nothing
+                              , line=trim hayStack
+                            }
+              fancyPrint resultLine
+              searchString (n+1) fileName hayStacks