4 files changed, 26 insertions, 29 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 26824724..ad96a1b8 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -9,11 +9,11 @@
 module Network.BitTorrent
        ( module Data.Torrent
 
-       , TorrentLoc(..), Progress(..)
+       , TorrentLoc(..), TorrentMap, Progress(..)
        , ThreadCount, SessionCount
 
        , ClientSession( clientPeerId, allowedExtensions )
-       , withDefaultClient, defaultThreadCount
+       , withDefaultClient, defaultThreadCount, defaultPorts
        , addTorrent
        , removeTorrent
 
@@ -21,6 +21,8 @@ module Network.BitTorrent
        , getPeerCount
        , getSwarmCount
        , getSessionCount
+       , getSwarm
+       , getStorage
 
          -- * Extensions
        , Extension
@@ -33,6 +35,7 @@ import Data.Torrent
 import Network.BitTorrent.Sessions.Types
 import Network.BitTorrent.Sessions
 import Network.BitTorrent.Extension
+import Network.BitTorrent.Tracker
 
 -- TODO remove fork from Network.BitTorrent.Exchange
 -- TODO make all forks in Internal.
@@ -46,22 +49,11 @@ withDefaultClient listPort dhtPort action = do
     Torrent management
 -----------------------------------------------------------------------}
 
--- | Used to check torrent location before register torrent.
-validateLocation :: TorrentLoc -> IO Torrent
-validateLocation TorrentLoc {..} = do
-  t <- fromFile metafilePath
---  exists <- doesDirectoryExist dataDirPath
---  unless exists $ do
---    throw undefined
-  return t
-
-
 -- | Register torrent and start downloading.
 addTorrent :: ClientSession -> TorrentLoc -> IO ()
-addTorrent clientSession loc @ TorrentLoc {..} = do
-  torrent <- validateLocation loc
---  registerTorrent loc tInfoHash
---  when (bf is not full)
+addTorrent cs loc @ TorrentLoc {..} = do
+  registerTorrent  cs loc
+  openSwarmSession cs loc
   return ()
 
 -- | Unregister torrent and stop all running sessions.
@@ -73,4 +65,4 @@ removeTorrent ses loc = undefined -- atomically $ unregisterTorrent ses loc
 --   content files.
 deleteTorrent :: ClientSession -> TorrentLoc -> IO ()
 deleteTorrent ClientSession {..} TorrentLoc {..} = undefined
--}
\ No newline at end of file
+-}
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index b2d639f6..dc1b2752 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -464,16 +464,15 @@ exchange :: Storage -> P2P ()
 exchange storage = {-# SCC exchange #-} awaitEvent >>= handler
   where
     handler (Available bf) = do
-      liftIO $ print (completeness bf)
       ixs <- selBlk (findMin bf) storage
       mapM_ (yieldEvent . Want) ixs -- TODO yield vectored
 
     handler (Want     bix) = do
+      liftIO $ print bix
       blk <- liftIO $ getBlk bix storage
       yieldEvent (Fragment blk)
 
     handler (Fragment blk @ Block {..}) = do
-      liftIO $ print (ppBlock blk)
       done <- liftIO $ putBlk blk storage
       when done $ do
         yieldEvent $ Available $ singleton blkPiece (succ blkPiece)
diff --git a/src/Network/BitTorrent/Sessions.hs b/src/Network/BitTorrent/Sessions.hs
index 6d99213a..43a34df9 100644
--- a/src/Network/BitTorrent/Sessions.hs
+++ b/src/Network/BitTorrent/Sessions.hs
@@ -26,11 +26,13 @@ module Network.BitTorrent.Sessions
        , TorrentLoc(..)
        , registerTorrent
        , unregisterTorrent
+       , getRegistered
 
        , getCurrentProgress
        , getSwarmCount
        , getPeerCount
        , getSwarm
+       , getStorage
        , openSwarmSession
 
          -- * Swarm
@@ -199,9 +201,7 @@ discover swarm @ SwarmSession {..} = {-# SCC discover #-} do
   withTracker progress conn $ \tses -> do
     forever $ do
       addr <- getPeerAddr tses
-      print addr
       forkThrottle swarm $ do
-        print addr
         initiatePeerSession swarm addr $ \conn -> do
           print addr
           runP2P conn p2p
@@ -252,6 +252,10 @@ getSwarm cs @ ClientSession {..} ih = do
     Active sw      -> return sw
     Registered loc -> openSwarmSession cs loc
 
+-- TODO do not spawn session!
+getStorage :: ClientSession -> InfoHash -> IO Storage
+getStorage cs ih = storage <$> getSwarm cs ih
+
 -- | Get the number of connected peers in the given swarm.
 getSessionCount :: SwarmSession -> IO SessionCount
 getSessionCount SwarmSession {..} = do
@@ -294,12 +298,17 @@ forkThrottle se action = do
 validateLocation :: TorrentLoc -> IO Torrent
 validateLocation = fromFile . metafilePath
 
-registerTorrent :: TVar TorrentMap -> TorrentLoc -> IO ()
-registerTorrent = error "registerTorrent"
+registerTorrent :: ClientSession -> TorrentLoc -> IO ()
+registerTorrent ClientSession {..} loc @ TorrentLoc {..} = do
+  torrent <- fromFile metafilePath
+  atomically $ modifyTVar' torrentMap $ HM.insert (tInfoHash torrent) loc
 
 unregisterTorrent :: TVar TorrentMap -> InfoHash -> IO ()
 unregisterTorrent = error "unregisterTorrent"
 
+getRegistered :: ClientSession -> IO TorrentMap
+getRegistered ClientSession {..} = readTVarIO torrentMap
+
 {-----------------------------------------------------------------------
   Peer session creation
 ------------------------------------------------------------------------
@@ -368,11 +377,10 @@ runSession connector opener action =
 -- | Used then the client want to connect to a peer.
 initiatePeerSession :: SwarmSession -> PeerAddr -> Exchange -> IO ()
 initiatePeerSession ss @ SwarmSession {..} addr
-    = runSession (putStrLn ("trying to connect" ++ show addr) *> connectToPeer addr <* putStrLn "connected") initiated
+    = runSession (connectToPeer addr) initiated
   where
     initiated sock = do
       phs  <- handshake sock (swarmHandshake ss)
-      putStrLn "handshaked"
       ps   <- openSession ss addr phs
       return ps
 
@@ -396,8 +404,6 @@ listener :: ClientSession -> Exchange -> PortNumber -> IO ()
 listener cs action serverPort = bracket openListener close loop
   where
     loop sock = forever $ handle isIOError $ do
-      putStrLn "listen"
-      print =<< getSocketName sock
       (conn, addr) <- accept sock
       putStrLn "accepted"
       case addr of
@@ -413,5 +419,5 @@ listener cs action serverPort = bracket openListener close loop
     openListener  = do
       sock <- socket AF_INET Stream =<< getProtocolNumber "tcp"
       bindSocket sock (SockAddrInet serverPort iNADDR_ANY)
-      listen sock 1
+      listen sock maxListenQueue
       return sock
diff --git a/src/Network/BitTorrent/Sessions/Types.lhs b/src/Network/BitTorrent/Sessions/Types.lhs
index f3a3e789..69411d4e 100644
--- a/src/Network/BitTorrent/Sessions/Types.lhs
+++ b/src/Network/BitTorrent/Sessions/Types.lhs
@@ -146,7 +146,7 @@ To avoid this we keep just *metainfo* about *metainfo*:
 >     -- | Full path to directory contating content files associated
 >     -- with the metafile.
 >   , dataDirPath  :: FilePath
->   }
+>   } deriving Show
 
 TorrentMap is used to keep track all known torrents for the
 client. When some peer trying to connect to us it's necessary to