diff options
Diffstat (limited to 'src/Network/BitTorrent.hs')
-rw-r--r-- | src/Network/BitTorrent.hs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs index c166b1b1..26824724 100644 --- a/src/Network/BitTorrent.hs +++ b/src/Network/BitTorrent.hs | |||
@@ -28,25 +28,19 @@ module Network.BitTorrent | |||
28 | , ppExtension | 28 | , ppExtension |
29 | ) where | 29 | ) where |
30 | 30 | ||
31 | import Control.Concurrent | ||
32 | import Control.Monad | ||
33 | import Control.Monad.Trans | ||
34 | import Network | 31 | import Network |
35 | import Data.Torrent | 32 | import Data.Torrent |
36 | import Network.BitTorrent.Sessions.Types | 33 | import Network.BitTorrent.Sessions.Types |
37 | import Network.BitTorrent.Sessions | 34 | import Network.BitTorrent.Sessions |
38 | import Network.BitTorrent.Extension | 35 | import Network.BitTorrent.Extension |
39 | import Network.BitTorrent.Exchange | ||
40 | |||
41 | import System.Torrent.Storage | ||
42 | 36 | ||
43 | -- TODO remove fork from Network.BitTorrent.Exchange | 37 | -- TODO remove fork from Network.BitTorrent.Exchange |
44 | -- TODO make all forks in Internal. | 38 | -- TODO make all forks in Internal. |
45 | 39 | ||
46 | -- | Client session with default parameters. Use it for testing only. | 40 | -- | Client session with default parameters. Use it for testing only. |
47 | withDefaultClient :: PortNumber -> PortNumber -> (ClientSession -> IO ()) -> IO () | 41 | withDefaultClient :: PortNumber -> PortNumber -> (ClientSession -> IO ()) -> IO () |
48 | withDefaultClient dhtPort listPort action = do | 42 | withDefaultClient listPort dhtPort action = do |
49 | withClientSession defaultThreadCount defaultExtensions listPort dhtPort action | 43 | withClientSession defaultThreadCount [] listPort dhtPort action |
50 | 44 | ||
51 | {----------------------------------------------------------------------- | 45 | {----------------------------------------------------------------------- |
52 | Torrent management | 46 | Torrent management |
@@ -68,14 +62,6 @@ addTorrent clientSession loc @ TorrentLoc {..} = do | |||
68 | torrent <- validateLocation loc | 62 | torrent <- validateLocation loc |
69 | -- registerTorrent loc tInfoHash | 63 | -- registerTorrent loc tInfoHash |
70 | -- when (bf is not full) | 64 | -- when (bf is not full) |
71 | |||
72 | swarm <- newLeecher clientSession torrent | ||
73 | storage <- openStorage (torrentMeta swarm) dataDirPath | ||
74 | forkIO $ discover swarm $ do | ||
75 | liftIO $ putStrLn "connected to peer" | ||
76 | forever $ do | ||
77 | liftIO $ putStrLn "from mesage loop" | ||
78 | exchange storage | ||
79 | return () | 65 | return () |
80 | 66 | ||
81 | -- | Unregister torrent and stop all running sessions. | 67 | -- | Unregister torrent and stop all running sessions. |