rename THP to Tracker

4 files changed, 18 insertions, 7 deletions

diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 4aa6123f..50ff549f 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -19,7 +19,8 @@ source-repository head
 library
   exposed-modules:     Data.Torrent
                      , Network.Torrent
-                     , Network.Torrent.THP
+                     , Network.Torrent.Tracker
+                     , Network.Torrent.Tracker.Scrape
                      , Network.Torrent.PeerWire
                      , Network.Torrent.PeerID
                      , Network.Torrent.Handshake
@@ -71,7 +72,7 @@ executable client
 
 
 
-test-suite info-hash.hs
+test-suite info-hash
   type:                exitcode-stdio-1.0
   main-is:             info-hash.hs
   hs-source-dirs:      tests
diff --git a/src/Network/Torrent.hs b/src/Network/Torrent.hs
index 30d19424..a9194d3e 100644
--- a/src/Network/Torrent.hs
+++ b/src/Network/Torrent.hs
@@ -1,11 +1,11 @@
 module Network.Torrent
        ( module Network.Torrent.PeerID
-       , module Network.Torrent.THP
+       , module Network.Torrent.Tracker
        , module Network.Torrent.PeerWire
        , module Network.Torrent.Handshake
        ) where
 
 import Network.Torrent.PeerID
-import Network.Torrent.THP
+import Network.Torrent.Tracker
 import Network.Torrent.PeerWire
 import Network.Torrent.Handshake
diff --git a/src/Network/Torrent/THP.hs b/src/Network/Torrent/Tracker.hs
index e584ead1..72fbcb44 100644
--- a/src/Network/Torrent/THP.hs
+++ b/src/Network/Torrent/Tracker.hs
@@ -1,12 +1,15 @@
 {-# OPTIONS -fno-warn-orphans #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Network.Torrent.THP
-       ( Peer(..), Event(..), TRequest(..), TResponse(..)
+module Network.Torrent.Tracker
+       ( module Network.Torrent.Tracker.Scrape
+       , Peer(..), Event(..), TRequest(..), TResponse(..)
        , defaultRequest, defaultPorts
        , sendRequest
        )
        where
 
+import Network.Torrent.Tracker.Scrape
+
 import Control.Applicative
 import Data.Char as Char
 import Data.Word (Word32)
@@ -188,7 +191,6 @@ defaultRequest announce hash pid =
   , reqEvent      = Just Started
   }
 
-
 -- | TODO rename to ask for peers
 --
 sendRequest :: TRequest -> IO (Result TResponse)
diff --git a/src/Network/Torrent/Tracker/Scrape.hs b/src/Network/Torrent/Tracker/Scrape.hs
new file mode 100644
index 00000000..2d1dec07
--- /dev/null
+++ b/src/Network/Torrent/Tracker/Scrape.hs
@@ -0,0 +1,8 @@
+module Network.Torrent.Tracker.Scrape
+       (
+       ) where
+
+import Network.URI
+
+scrapeURL :: URI -> Maybe URI
+scrapeURL = undefined