1 files changed, 12 insertions, 13 deletions
diff --git a/src/Fetch.hs b/src/Fetch.hs
index ea82caa..5d14de4 100644
--- a/src/Fetch.hs
+++ b/src/Fetch.hs
@@ -1,12 +1,13 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 module Fetch
-  ( fetchResumes
-  , fetchAds
+  ( resumes
+  , ads
   ) where
 
 import Data.Text (Text)
 import qualified Data.Text.IO as T
+import Data.Either (rights)
 
 import Page
 
@@ -18,18 +19,16 @@ import Model.URL (URL)
 import qualified Parser.Resume as Resume
 import qualified Parser.Detail as Detail
 
-fetchResumes :: URL -> IO (Either Text [Resume])
-fetchResumes url = do
-  resumes <- fmap Resume.parse <$> Page.get url
-  if null resumes
+resumes :: [URL] -> IO [Resume]
+resumes urls = do
+  results <- fmap (concat . map Resume.parse . rights) . sequence . map Page.get $ urls
+  if null results
     then T.putStrLn "Parsed 0 results!"
     else return ()
-  return resumes
+  return results
 
-fetchAds :: [Resume] -> IO (Either Text [Ad])
-fetchAds resumes = do
-  xs <- sequence $ map fetchAd resumes
-  return $ sequence xs
+ads :: [Resume] -> IO (Either Text [Ad])
+ads = fmap sequence . sequence . map ad
 
-fetchAd :: Resume -> IO (Either Text Ad)
-fetchAd resume = fmap (\ad -> Ad resume (Detail.parse ad)) <$> Page.get (Resume.url resume)
+ad :: Resume -> IO (Either Text Ad)
+ad resume = fmap (\x -> Ad resume (Detail.parse x)) <$> Page.get (Resume.url resume)