2 files changed, 37 insertions, 18 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index ea6b88bd..5521a825 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -24,6 +24,10 @@ module Network.BitTorrent
        , getPeerCount
        , getSwarmCount
 
+       , TorrentLoc(..)
+       , addTorrent
+       , removeTorrent
+
          -- ** Swarm
        , SwarmSession(torrentMeta)
 
@@ -76,6 +80,7 @@ module Network.BitTorrent
        ) where
 
 import Control.Concurrent
+import Control.Concurrent.STM
 import Control.Exception
 import Control.Monad
 import Control.Monad.Reader
@@ -119,21 +124,27 @@ discover swarm @ SwarmSession {..} action = {-# SCC discover #-} do
 {-----------------------------------------------------------------------
     Torrent management
 -----------------------------------------------------------------------}
-{-
+
+-- | Register torrent and start downloading.
 addTorrent :: ClientSession -> TorrentLoc -> IO ()
-addTorrent ClientSession {..} TorrentLoc {..} = do
-  torrent <- fromFile metafilePath
+addTorrent clientSession loc @ TorrentLoc {..} = do
+  torrent <- registerTorrent loc
   swarm   <- newLeecher  clientSession torrent
-  storage <- swarm `bindTo` dataDir
-  discover swarm $ do
+  storage <- swarm `bindTo` dataDirPath
+  forkIO $ discover swarm $ do
     liftIO $ putStrLn "connected to peer"
     forever $ do
       liftIO $ putStrLn "from mesage loop"
       exchange storage
+  return ()
 
-removeTorrent :: ClientSession -> TorrentLoc ->  IO ()
-removeTorrent ClientSession {..} TorrentLoc {..} = undefined
+-- | Unregister torrent and stop all running sessions.
+removeTorrent :: ClientSession -> InfoHash ->  IO ()
+removeTorrent ses loc = atomically $ unregisterTorrent ses loc
 
+{-
+-- | The same as 'removeTorrrent' torrent, but delete all torrent
+--   content files.
 deleteTorrent :: ClientSession -> TorrentLoc -> IO ()
 deleteTorrent ClientSession {..} TorrentLoc {..} = undefined
 -}
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Internal.lhs b/src/Network/BitTorrent/Internal.lhs
index f46ca244..e3fe3dac 100644
--- a/src/Network/BitTorrent/Internal.lhs
+++ b/src/Network/BitTorrent/Internal.lhs
@@ -231,7 +231,7 @@ To avoid this we keep just *metainfo* about *metainfo*:
 >     metafilePath :: FilePath
 >     -- | Full path to directory contating content files associated
 >     -- with the metafile.
->   , dataPath     :: FilePath
+>   , dataDirPath  :: FilePath
 >   }
 
 TorrentMap is used to keep track all known torrents for the
@@ -258,8 +258,24 @@ validate corresponding piece and only after read and send the block
 back.
 
 > -- | Used to check torrent location before register torrent.
-> validateTorrent :: TorrentLoc -> IO ()
-> validateTorrent = error "validateTorrent: not implemented"
+> validateTorrent :: TorrentLoc -> IO Torrent
+> validateTorrent TorrentLoc {..} = do
+>   t <- fromFile metafilePath
+>   exists <- doesDirectoryExist dataDirPath
+>   unless exists $ do
+>     throw undefined
+>   return t
+
+> registerTorrent :: TVar TorrentMap -> TorrentLoc -> IO (Maybe Torrent)
+> registerTorrent ClientSession {..} tl = do
+>   Torrent {..} <- validateTorrent tl
+>   atomically $ modifyTVar' torrentMap $ HM.insert tInfoHash tl
+>   return (Just t)
+>
+
+> unregisterTorrent :: TVar TorrentMap -> InfoHash -> IO ()
+> unregisterTorrent ClientSession {..} ih = do
+>   modifyTVar' torrentMap $ HM.delete ih
 
 Client session
 ------------------------------------------------------------------------
@@ -366,14 +382,6 @@ and different enabled extensions at the same time.
 >     <*> newTVarIO (startProgress 0)
 >     <*> newTVarIO HM.empty
 
-> registerTorrent :: ClientSession -> InfoHash -> TorrentLoc -> STM ()
-> registerTorrent ClientSession {..} ih tl = do
->   modifyTVar' torrentMap $ HM.insert ih tl
-
-> unregisterTorrent :: ClientSession -> InfoHash -> STM ()
-> unregisterTorrent ClientSession {..} ih = do
->   modifyTVar' torrentMap $ HM.delete ih
-
 Swarm session
 ------------------------------------------------------------------------