6 files changed, 41 insertions, 9 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index ff181ff8..00f8da49 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -151,6 +151,7 @@ test-suite spec
                      , bytestring
                      , directory
                      , filepath
+                     , time
 
                      , aeson
                      , cereal
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index fc0cb10b..4d6461af 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -26,6 +26,7 @@
 module Data.Torrent
        ( -- * Info dictionary
          InfoDict (..)
+       , infoDictionary
 
          -- ** Lenses
        , infohash
@@ -131,6 +132,13 @@ instance Hashable InfoDict where
   hash = Hashable.hash . idInfoHash
   {-# INLINE hash #-}
 
+-- | Smart constructor: add a info hash to info dictionary.
+infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict
+infoDictionary li pinfo private = InfoDict ih li pinfo private
+  where
+    ih = IH.hashlazy $ encode $ InfoDict fake_ih li pinfo private
+    fake_ih = InfoHash ""
+
 getPrivate :: Get Bool
 getPrivate = (Just True ==) <$>? "private"
 
@@ -155,8 +163,8 @@ instance BEncode InfoDict where
 ppPrivacy :: Bool -> Doc
 ppPrivacy privacy = "Privacy: " <> if privacy then "private" else "public"
 
-ppAdditionalInfo :: InfoDict -> Doc
-ppAdditionalInfo layout = PP.empty
+--ppAdditionalInfo :: InfoDict -> Doc
+--ppAdditionalInfo layout = PP.empty
 
 instance Pretty InfoDict where
   pretty InfoDict {..} =
@@ -246,6 +254,9 @@ instance BEncode URI where
   fromBEncode b           = decodingError $ "url <" ++ show b ++ ">"
   {-# INLINE fromBEncode #-}
 
+--pico2uni :: Pico -> Uni
+--pico2uni = undefined
+
 -- TODO move to bencoding
 instance BEncode POSIXTime where
   toBEncode pt = toBEncode (floor pt :: Integer)
diff --git a/src/Data/Torrent/Piece.hs b/src/Data/Torrent/Piece.hs
index 6cff53d6..7eb4e3d5 100644
--- a/src/Data/Torrent/Piece.hs
+++ b/src/Data/Torrent/Piece.hs
@@ -25,6 +25,7 @@ module Data.Torrent.Piece
        , isPiece
 
          -- * Piece control
+       , HashArray (..)
        , PieceInfo (..)
        , pieceCount
 
@@ -138,6 +139,7 @@ isPiece pieceLen blk @ (Block i offset _) =
 -- Piece control
 -----------------------------------------------------------------------}
 
+-- | A flat array of SHA1 sums of each piece.
 newtype HashArray = HashArray { unHashArray :: ByteString }
                     deriving (Show, Read, Eq, BEncode)
 
diff --git a/tests/Data/Torrent/ClientSpec.hs b/tests/Data/Torrent/ClientSpec.hs
index 0ff74f6f..4bc881c3 100644
--- a/tests/Data/Torrent/ClientSpec.hs
+++ b/tests/Data/Torrent/ClientSpec.hs
@@ -27,4 +27,7 @@ spec = do
       clientInfo "OP0123xxxxxxxxxxxxxx" `shouldBe` "Opera-123"
 
     it "decode ML donkey style peer id" $ do
-      clientInfo "-ML2.7.2-xxxxxxxxxxx" `shouldBe` "MLdonkey-0"
\ No newline at end of file
+      clientInfo "-ML2.7.2-xxxxxxxxxxx" `shouldBe` "MLdonkey-0"
+
+-- TODO XBT, Bits on Wheels, Queen Bee, BitTyrant, TorrenTopia,
+-- BitSpirit, Rufus, G3 Torrent, FlashGet
\ No newline at end of file
diff --git a/tests/Data/Torrent/MagnetSpec.hs b/tests/Data/Torrent/MagnetSpec.hs
index 5adc6df7..3ecf8705 100644
--- a/tests/Data/Torrent/MagnetSpec.hs
+++ b/tests/Data/Torrent/MagnetSpec.hs
@@ -3,6 +3,7 @@ module Data.Torrent.MagnetSpec (spec) where
 
 import Control.Applicative
 import Data.Maybe
+import Data.Monoid
 import Test.Hspec
 import Test.QuickCheck
 import Test.QuickCheck.Instances ()
@@ -23,7 +24,7 @@ instance Arbitrary URI where
 instance Arbitrary Magnet where
   arbitrary = Magnet <$> arbitrary <*> arbitrary
     <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
-    <*> arbitrary <*> arbitrary <*> pure (error "arbitrary magnet")
+    <*> arbitrary <*> arbitrary <*> pure mempty
 
 magnetEncoding :: Magnet -> Bool
 magnetEncoding m = parseMagnet (renderMagnet m) == Just m
diff --git a/tests/Data/Torrent/MetainfoSpec.hs b/tests/Data/Torrent/MetainfoSpec.hs
index 297b28f1..636bb6b1 100644
--- a/tests/Data/Torrent/MetainfoSpec.hs
+++ b/tests/Data/Torrent/MetainfoSpec.hs
@@ -7,11 +7,13 @@ import Data.ByteString as BS
 import Data.ByteString.Lazy as BL
 import Data.BEncode
 import Data.Maybe
+import Data.Time
 import Network.URI
 import Test.Hspec
 import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 
+import Data.Torrent.Piece
 import Data.Torrent.Layout
 import Data.Torrent
 
@@ -23,8 +25,8 @@ import Data.Torrent
 data T a = T
 
 prop_properBEncode :: Show a => BEncode a => Eq a
-                   => T a -> a -> Bool
-prop_properBEncode _ expected = actual == Right expected
+                   => T a -> a -> IO ()
+prop_properBEncode _ expected = actual `shouldBe` Right expected
   where
     actual = decode $ BL.toStrict $ encode expected
 
@@ -48,13 +50,25 @@ instance Arbitrary LayoutInfo where
     , MultiFile  <$> arbitrary <*> arbitrary
     ]
 
+instance Arbitrary HashArray where
+  arbitrary = HashArray <$> arbitrary
+
+instance Arbitrary PieceInfo where
+  arbitrary = PieceInfo <$> arbitrary <*> arbitrary
+
 instance Arbitrary InfoDict where
-  arbitrary = undefined
+  arbitrary = infoDictionary <$> arbitrary <*> arbitrary <*> arbitrary
+
+pico :: Gen (Maybe NominalDiffTime)
+pico = oneof
+  [ pure Nothing
+  , (Just . fromIntegral) <$> (arbitrary :: Gen Int)
+  ]
 
 instance Arbitrary Torrent where
   arbitrary = Torrent <$> arbitrary
-                 <*> arbitrary <*> arbitrary <*> arbitrary
-                 <*> arbitrary <*> arbitrary <*> arbitrary
+                 <*> arbitrary <*> arbitrary    <*> arbitrary
+                 <*> pico      <*> arbitrary    <*> arbitrary
                  <*> arbitrary <*> pure Nothing <*> arbitrary
 
 {-----------------------------------------------------------------------