6 files changed, 92 insertions, 96 deletions

diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 11d371e6..44dee474 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -22,7 +22,6 @@ source-repository head
 
 library
   exposed-modules:     Data.Torrent
-                     , Data.Torrent.InfoHash
                      , Data.Bitfield
 
                      , Network.BitTorrent
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 873d90dd..3d5f669e 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -6,31 +6,57 @@
 --   Portability :  portable
 --
 --   This module provides torrent metainfo serialization.
+--
 {-# OPTIONS -fno-warn-orphans #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards   #-}
+-- TODO refine interface
 module Data.Torrent
-       ( module Data.Torrent.InfoHash
-       , Torrent(..), ContentInfo(..), FileInfo(..)
+       ( -- * Torrent
+         Torrent(..), ContentInfo(..), FileInfo(..)
        , contentLength, pieceCount, blockCount
+       , fromFile
+
+         -- * Files layout
        , Layout, contentLayout
        , isSingleFile, isMultiFile
-       , fromFile
 
+         -- * Info hash
+       , InfoHash, ppInfoHash
+       , hash, hashlazy
+       , addHashToURI
+
+         -- * Extra
        , sizeInBase
+
+         -- * Internal
+       , InfoHash(..)
        ) where
 
+import Prelude hiding (sum)
+
 import Control.Applicative
 import Control.Arrow
+import Data.BEncode as BE
+import Data.Char
+import Data.Foldable
+import           Data.Map (Map)
 import qualified Data.Map as M
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC (pack, unpack)
+import qualified Data.ByteString.Builder as B
+import qualified Data.ByteString.Builder.Prim as B
+import qualified Data.ByteString.Lazy as Lazy
+import qualified Data.List as L
 import           Data.Text (Text)
-import Data.BEncode
-import Data.Torrent.InfoHash
+import           Data.Serialize as S hiding (Result)
+import qualified Crypto.Hash.SHA1 as C
 import Network.URI
 import System.FilePath
+import Numeric
+
 
 type Time = Text
 
@@ -157,7 +183,7 @@ instance BEncodable Torrent where
     ]
 
   fromBEncode (BDict d) | Just info <- M.lookup "info" d =
-    Torrent <$> pure (hashlazy (encode info)) -- WARN
+    Torrent <$> pure (hashlazy (BE.encode info)) -- WARN
             <*> d >--  "announce"
             <*> d >--? "announce-list"
             <*> d >--? "comment"
@@ -267,7 +293,60 @@ isMultiFile :: ContentInfo -> Bool
 isMultiFile MultiFile {} = True
 isMultiFile _            = False
 
-
 -- | Read and decode a .torrent file.
 fromFile :: FilePath -> IO (Result Torrent)
 fromFile filepath = decoded <$> B.readFile filepath
+
+{-----------------------------------------------------------------------
+    Serialization
+-----------------------------------------------------------------------}
+
+-- | Exactly 20 bytes long SHA1 hash.
+newtype InfoHash = InfoHash { getInfoHash :: ByteString }
+                   deriving (Eq, Ord)
+
+instance BEncodable InfoHash where
+  toBEncode = toBEncode . getInfoHash
+
+instance Show InfoHash where
+  show = BC.unpack . ppInfoHash
+
+instance Serialize InfoHash where
+  put = putByteString . getInfoHash
+  get = InfoHash <$> getBytes 20
+
+instance BEncodable a => BEncodable (Map InfoHash a) where
+  {-# SPECIALIZE instance BEncodable a => BEncodable (Map InfoHash a)  #-}
+  fromBEncode b = M.mapKeys InfoHash <$> fromBEncode b
+  {-# INLINE fromBEncode #-}
+
+  toBEncode = toBEncode . M.mapKeys getInfoHash
+  {-# INLINE toBEncode #-}
+
+hash :: ByteString -> InfoHash
+hash = InfoHash . C.hash
+
+hashlazy :: Lazy.ByteString -> InfoHash
+hashlazy = InfoHash . C.hashlazy
+
+ppInfoHash :: InfoHash -> ByteString
+ppInfoHash = Lazy.toStrict . B.toLazyByteString .
+        foldMap (B.primFixed B.word8HexFixed) . B.unpack . getInfoHash
+
+addHashToURI :: URI -> InfoHash -> URI
+addHashToURI uri s = uri {
+    uriQuery = uriQuery uri ++ mkPref (uriQuery uri) ++
+               "info_hash=" ++ rfc1738Encode (BC.unpack (getInfoHash s))
+  }
+  where
+    mkPref [] = "?"
+    mkPref ('?' : _) = "&"
+    mkPref _ = error "addHashToURI"
+
+    rfc1738Encode = L.concatMap (\c -> if unreservedS c then [c] else encodeHex c)
+      where
+        unreservedS = (`L.elem` chars)
+        chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./"
+        encodeHex c = '%' : pHex c
+        pHex c = let p = (showHex . ord $ c) ""
+                 in if L.length p == 1 then '0' : p else p
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
deleted file mode 100644
index 51ce0ecd..00000000
--- a/src/Data/Torrent/InfoHash.hs
+++ /dev/null
@@ -1,84 +0,0 @@
--- |
---   Copyright   :  (c) Sam T. 2013
---   License     :  MIT
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  experimental
---   Portability :  portable
---
-{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
-module Data.Torrent.InfoHash
-       ( InfoHash (getInfoHash)
-       , addHashToURI
-
-         -- * Construction
-       , hash, hashlazy
-
-         -- * Extra
-       , ppHex
-       ) where
-
-import Control.Applicative
-import Data.BEncode
-import Data.Char
-import Data.List as L
-import Data.Foldable
-import           Data.Map (Map)
-import qualified Data.Map as M
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Char8 as BC
-import qualified Data.ByteString.Builder as B
-import qualified Data.ByteString.Builder.Prim as B
-import qualified Data.ByteString.Lazy as Lazy
-import Data.Serialize
-import qualified Crypto.Hash.SHA1 as C
-import Network.URI
-import Numeric
-
-
--- | Exactly 20 bytes long SHA1 hash.
-newtype InfoHash = InfoHash { getInfoHash :: ByteString }
-                   deriving (Eq, Ord, BEncodable)
-
-instance Show InfoHash where
-  show = BC.unpack . ppHex
-
-instance Serialize InfoHash where
-  put = putByteString . getInfoHash
-  get = InfoHash <$> getBytes 20
-
-instance BEncodable a => BEncodable (Map InfoHash a) where
-  {-# SPECIALIZE instance BEncodable a => BEncodable (Map InfoHash a)  #-}
-  fromBEncode b = M.mapKeys InfoHash <$> fromBEncode b
-  {-# INLINE fromBEncode #-}
-
-  toBEncode = toBEncode . M.mapKeys getInfoHash
-  {-# INLINE toBEncode #-}
-
-hash :: ByteString -> InfoHash
-hash = InfoHash . C.hash
-
-hashlazy :: Lazy.ByteString -> InfoHash
-hashlazy = InfoHash . C.hashlazy
-
-ppHex :: InfoHash -> ByteString
-ppHex = Lazy.toStrict . B.toLazyByteString .
-        foldMap (B.primFixed B.word8HexFixed) . B.unpack . getInfoHash
-
-addHashToURI :: URI -> InfoHash -> URI
-addHashToURI uri s = uri {
-    uriQuery = uriQuery uri ++ mkPref (uriQuery uri) ++
-               "info_hash=" ++ rfc1738Encode (BC.unpack (getInfoHash s))
-  }
-  where
-    mkPref [] = "?"
-    mkPref ('?' : _) = "&"
-    mkPref _ = error "addHashToURI"
-
-    rfc1738Encode = L.concatMap (\c -> if unreservedS c then [c] else encodeHex c)
-      where
-        unreservedS = (`L.elem` chars)
-        chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./"
-        encodeHex c = '%' : pHex c
-        pHex c = let p = (showHex . ord $ c) ""
-                 in if L.length p == 1 then '0' : p else p
diff --git a/src/Network/BitTorrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs
index c4acf5cc..6f4598ae 100644
--- a/src/Network/BitTorrent/PeerWire/Handshake.hs
+++ b/src/Network/BitTorrent/PeerWire/Handshake.hs
@@ -27,10 +27,10 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC
 import Data.Serialize as S
-import Data.Torrent.InfoHash
 import Network
 import Network.Socket.ByteString
 
+import Data.Torrent
 import Network.BitTorrent.Extension
 import Network.BitTorrent.Peer.ID
 import Network.BitTorrent.Peer.ClientInfo
diff --git a/src/Network/BitTorrent/Tracker/Scrape.hs b/src/Network/BitTorrent/Tracker/Scrape.hs
index c3f4ee64..0181cf9f 100644
--- a/src/Network/BitTorrent/Tracker/Scrape.hs
+++ b/src/Network/BitTorrent/Tracker/Scrape.hs
@@ -28,10 +28,12 @@ import qualified Data.ByteString.Char8 as BC
 import           Data.Map (Map)
 import qualified Data.Map as M
 import Data.Monoid
-import Data.Torrent.InfoHash
 import Network.URI
 import Network.HTTP
 
+import Data.Torrent
+
+
 -- | Information about particular torrent.
 data ScrapeInfo = ScrapeInfo {
     siComplete   :: Int
diff --git a/tests/info-hash.hs b/tests/info-hash.hs
index ce8d7db2..290b5063 100644
--- a/tests/info-hash.hs
+++ b/tests/info-hash.hs
@@ -23,8 +23,8 @@ main = do
   Right t <- fromFile path
 
   BC.putStr "info hash: "
-  BC.putStrLn (ppHex (tInfoHash t))
+  BC.putStrLn (ppInfoHash (tInfoHash t))
 
-  let passed = checkInfo == ppHex (tInfoHash t)
+  let passed = checkInfo == ppInfoHash (tInfoHash t)
   print passed
   if passed then exitSuccess else exitFailure