Avoid use of catch to fix compilation on old GHC

Author: jaspervdj

src/NumberSix.hs

@@ -15,7 +15,6 @@ import           Control.Monad           (forM, forM_)
 import           Data.Maybe              (catMaybes)
 import qualified Data.Text               as T
 import qualified Database.SQLite.Simple  as Sqlite
-import           Prelude                 hiding (catch)
 import           System.Environment      (getProgName)
 
 

src/NumberSix/Handlers/Http.hs

@@ -6,14 +6,13 @@ module NumberSix.Handlers.Http
 
 
 --------------------------------------------------------------------------------
-import           Control.Exception    (SomeException (..), catch)
+import           Control.Exception    (SomeException (..), handle)
 import           Control.Monad.Trans  (liftIO)
 import           Data.Text            (Text)
 import qualified Data.Text            as T
 import qualified Data.Text.Encoding   as T
 import qualified Network.HTTP.Conduit as H
 import qualified Network.HTTP.Types   as H
-import           Prelude              hiding (catch)
 
 
 --------------------------------------------------------------------------------
@@ -48,8 +47,9 @@ http uri = do
 --------------------------------------------------------------------------------
 -- | Catch possible network errors
 wrapped :: Text -> IO Text
-wrapped uri = catch (http uri) $ \(SomeException e) ->
-    return $ T.pack $ show e
+wrapped uri = handle
+    (\(SomeException e) -> return $ T.pack $ show e)
+    (http uri)
 
 
 --------------------------------------------------------------------------------

src/NumberSix/Handlers/NowPlaying.hs

@@ -7,12 +7,11 @@ module NumberSix.Handlers.NowPlaying
 
 --------------------------------------------------------------------------------
 import           Control.Applicative  ((<$>))
-import           Control.Exception
+import           Control.Exception    (SomeException (..), handle)
 import           Control.Monad.Trans  (liftIO)
 import           Data.Text            (Text)
 import qualified Data.Text.Encoding   as T
 import qualified Network.HTTP.Conduit as HC
-import           Prelude              hiding (catch)
 import           Text.XmlHtml
 import           Text.XmlHtml.Cursor
 
@@ -62,8 +61,8 @@ rgrfm = do
 
 --------------------------------------------------------------------------------
 urgent :: IO Text
-urgent = catch
-    (T.decodeUtf8 <$> http url id) (\(SomeException _) -> randomError)
+urgent = handle
+    (\(SomeException _) -> randomError) (T.decodeUtf8 <$> http url id)
   where
     url = "http://urgent.fm/nowplaying/livetrack.txt"
 

src/NumberSix/Handlers/Resto.hs

@@ -63,6 +63,7 @@ resto arg = do
         url    = "http://zeus.ugent.be/hydra/api/1.0/resto/week/" ++
             dropWhile (== '0') week ++ ".json"
 
+    print url
     http (T.pack url) id >>= \bs -> case parseJsonEither bs of
         Left _             -> randomError
         Right (WeekMenu m) -> return $ case M.lookup (T.pack day) m of

src/NumberSix/Handlers/Weather.hs

@@ -10,7 +10,7 @@ module NumberSix.Handlers.Weather
 
 --------------------------------------------------------------------------------
 import           Control.Applicative  ((<$>), (<*>))
-import           Control.Exception    (catch)
+import           Control.Exception    (handle)
 import           Control.Monad        (mzero)
 import           Control.Monad.Trans  (liftIO)
 import           Data.Aeson           (FromJSON (..), Value (..), (.:))
@@ -77,8 +77,9 @@ instance Show Description where
 --------------------------------------------------------------------------------
 getWeather :: Text -> IO (Maybe Weather)
 getWeather query = do
-    result <- ((parseJsonEither <$> http url id) :: IO (Either String Weather))
-        `catch` (\ex -> return $ Left $ show (ex :: HttpException))
+    result <- handle
+        (\ex -> return $ Left $ show (ex :: HttpException))
+        ((parseJsonEither <$> http url id) :: IO (Either String Weather))
     either (const $ return Nothing) (return . Just) result
   where
     loc = if T.null query then "gent" else query