~ Use exception in fromFile.

Again, the problem is that one function returns errors in two different
ways: Either and IO exceptions. It's better to just throw exception in
either case.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 3175e151..068e9cb6 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -55,6 +55,8 @@ import Prelude hiding (sum)
 
 import Control.Applicative
 import Control.Arrow
+import Control.Exception
+import Control.Monad
 import Data.BEncode as BE
 import Data.Char
 import Data.Foldable
@@ -353,8 +355,8 @@ isMultiFile MultiFile {} = True
 isMultiFile _            = False
 
 -- | Read and decode a .torrent file.
-fromFile :: FilePath -> IO (Result Torrent)
-fromFile filepath = decoded <$> B.readFile filepath
+fromFile :: FilePath -> IO Torrent
+fromFile = B.readFile >=> either (throwIO . userError) return . decoded
 
 {-----------------------------------------------------------------------
     Info hash
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 61185d08..c37129cb 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -28,6 +28,8 @@ import Network.BitTorrent.Peer as BT
 import Network.BitTorrent.Exchange as BT
 import Network.BitTorrent.Tracker as BT
 
+-- discover should hide tracker and DHT communication under the hood
+-- thus we can obtain unified interface
 
 discover :: SwarmSession -> (TSession -> IO a) -> IO a
 discover SwarmSession {..} action = do