1 files changed, 37 insertions, 7 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index c22ca189..8746fff5 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -100,7 +100,9 @@ module Data.Torrent
        , layoutInfo
        , pieceInfo
        , isPrivate
+#ifdef VERSION_bencoding
        , infoDictionary
+#endif
 
          -- * Torrent file
        , Torrent(..)
@@ -122,8 +124,10 @@ module Data.Torrent
        , typeTorrent
        , torrentExt
        , isTorrentPath
+#ifdef VERSION_bencoding
        , fromFile
        , toFile
+#endif
 
          -- * Magnet
          -- $magnet-link
@@ -150,8 +154,10 @@ import Control.Exception
 import Control.Lens
 import Control.Monad
 import Crypto.Hash.SHA1 as SHA1
+#ifdef VERSION_bencoding
 import Data.BEncode as BE
 import Data.BEncode.Types as BE
+#endif
 import Data.Bits
 #ifdef VERSION_bits_extras
 import Data.Bits.Extras
@@ -223,10 +229,12 @@ instance Hashable InfoHash where
   hashWithSalt s (InfoHash ih) = hashWithSalt s ih
   {-# INLINE hashWithSalt #-}
 
+#ifdef VERSION_bencoding
 -- | Convert to\/from raw bencoded string. (no encoding)
 instance BEncode InfoHash where
   toBEncode = toBEncode . getInfoHash
   fromBEncode be = InfoHash <$> fromBEncode be
+#endif
 
 -- | Convert to\/from raw bytestring. (no encoding)
 instance Serialize InfoHash where
@@ -321,7 +329,9 @@ shortHex = T.take 7 . longHex
 -- | Size of a file in bytes.
 type FileSize = FileOffset
 
+#ifdef VERSION_bencoding
 deriving instance BEncode  FileOffset
+#endif
 
 -- | Contain metainfo about one single file.
 data FileInfo a = FileInfo {
@@ -360,6 +370,7 @@ instance NFData a => NFData (FileInfo a) where
   rnf FileInfo {..} = rnf fiName
   {-# INLINE rnf #-}
 
+#ifdef VERSION_bencoding
 instance BEncode (FileInfo [BS.ByteString]) where
   toBEncode FileInfo {..} = toDict $
        "length" .=! fiLength
@@ -375,7 +386,9 @@ instance BEncode (FileInfo [BS.ByteString]) where
   {-# INLINE fromBEncode #-}
 
 type Put a = a -> BDict -> BDict
+#endif
 
+#ifdef VERSION_bencoding
 putFileInfoSingle :: Data.Torrent.Put (FileInfo BS.ByteString)
 putFileInfoSingle FileInfo {..} cont =
        "length" .=! fiLength
@@ -395,6 +408,7 @@ instance BEncode (FileInfo BS.ByteString) where
 
   fromBEncode = fromDict getFileInfoSingle
   {-# INLINE fromBEncode #-}
+#endif
 
 instance Pretty (FileInfo BS.ByteString) where
   pPrint FileInfo {..} =
@@ -447,6 +461,7 @@ instance NFData LayoutInfo where
 instance Default LayoutInfo where
   def = MultiFile [] ""
 
+#ifdef VERSION_bencoding
 getLayoutInfo :: BE.Get LayoutInfo
 getLayoutInfo = single <|> multi
   where
@@ -463,6 +478,7 @@ putLayoutInfo MultiFile  {..} = \ cont ->
 instance BEncode LayoutInfo where
   toBEncode   = toDict . (`putLayoutInfo` endDict)
   fromBEncode = fromDict getLayoutInfo
+#endif
 
 instance Pretty LayoutInfo where
   pPrint SingleFile {..} = pPrint liFile
@@ -637,7 +653,11 @@ hashPiece Piece {..} = SHA1.hashlazy pieceData
 
 -- | A flat array of SHA1 hash for each piece.
 newtype HashList = HashList { unHashList :: BS.ByteString }
-  deriving (Show, Read, Eq, BEncode, Typeable)
+  deriving ( Show, Read, Eq, Typeable
+#ifdef VERSION_bencoding
+           , BEncode
+#endif
+           )
 
 -- | Empty hash list.
 instance Default HashList where
@@ -665,6 +685,7 @@ instance Default PieceInfo where
   def = PieceInfo 1 def
 
 
+#ifdef VERSION_bencoding
 putPieceInfo :: Data.Torrent.Put PieceInfo
 putPieceInfo PieceInfo {..} cont =
        "piece length" .=! piPieceLength
@@ -679,6 +700,7 @@ getPieceInfo = do
 instance BEncode PieceInfo where
   toBEncode   = toDict . (`putPieceInfo` endDict)
   fromBEncode = fromDict getPieceInfo
+#endif
 
 -- | Hashes are omitted.
 instance Pretty PieceInfo where
@@ -750,6 +772,13 @@ instance Hashable InfoDict where
   hashWithSalt = Hashable.hashUsing idInfoHash
   {-# INLINE hashWithSalt #-}
 
+-- | Hash lazy bytestring using SHA1 algorithm.
+hashLazyIH :: BL.ByteString -> InfoHash
+hashLazyIH = either (const (error msg)) id . safeConvert . SHA1.hashlazy
+  where
+    msg = "Infohash.hash: impossible: SHA1 is always 20 bytes long"
+
+#ifdef VERSION_bencoding
 -- | Empty info dictionary with zero-length content.
 instance Default InfoDict where
   def = infoDictionary def def False
@@ -767,12 +796,6 @@ putPrivate :: Bool -> BDict -> BDict
 putPrivate False = id
 putPrivate True  = \ cont -> "private" .=! True .: cont
 
--- | Hash lazy bytestring using SHA1 algorithm.
-hashLazyIH :: BL.ByteString -> InfoHash
-hashLazyIH = either (const (error msg)) id . safeConvert . SHA1.hashlazy
-  where
-    msg = "Infohash.hash: impossible: SHA1 is always 20 bytes long"
-
 instance BEncode InfoDict where
   toBEncode InfoDict {..} = toDict $
       putLayoutInfo idLayoutInfo   $
@@ -786,6 +809,7 @@ instance BEncode InfoDict where
                   <*> getPrivate
     where
       ih = hashLazyIH (BE.encode dict)
+#endif
 
 ppPrivacy :: Bool -> Doc
 ppPrivacy privacy = "Privacy: " <> if privacy then "private" else "public"
@@ -868,6 +892,7 @@ makeLensesFor
 instance NFData Torrent where
   rnf Torrent {..} = rnf tInfoDict
 
+#ifdef VERSION_bencoding
 -- TODO move to bencoding
 instance BEncode URI where
   toBEncode uri = toBEncode (BC.pack (uriToString id uri ""))
@@ -918,6 +943,7 @@ instance BEncode Torrent where
             <*>? "publisher"
             <*>? "publisher-url"
             <*>? "signature"
+#endif
 
 (<:>) :: Doc -> Doc -> Doc
 name <:>   v       = name <> ":" <+> v
@@ -949,9 +975,11 @@ instance Pretty Torrent where
         "Publisher URL" <:>? ((text . show) <$> tPublisherURL) $$
         "Signature"     <:>? ((text . show) <$> tSignature)
 
+#ifdef VERSION_bencoding
 -- | No files, no trackers, no nodes, etc...
 instance Default Torrent where
   def = nullTorrent def
+#endif
 
 -- | A simple torrent contains only required fields.
 nullTorrent :: InfoDict -> Torrent
@@ -971,6 +999,7 @@ torrentExt = "torrent"
 isTorrentPath :: FilePath -> Bool
 isTorrentPath filepath = takeExtension filepath == extSeparator : torrentExt
 
+#ifdef VERSION_bencoding
 -- | Read and decode a .torrent file.
 fromFile :: FilePath -> IO Torrent
 fromFile filepath = do
@@ -982,6 +1011,7 @@ fromFile filepath = do
 -- | Encode and write a .torrent file.
 toFile :: FilePath -> Torrent -> IO ()
 toFile filepath = BL.writeFile filepath . BE.encode
+#endif
 
 {-----------------------------------------------------------------------
 --  URN