diff options
-rw-r--r-- | bittorrent.cabal | 2 | ||||
-rw-r--r-- | src/Data/Torrent/Layout.hs | 4 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Block.hs (renamed from src/Data/Torrent/Block.hs) | 2 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Message.hs | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/bittorrent.cabal b/bittorrent.cabal index 5ced06b4..e4dbd626 100644 --- a/bittorrent.cabal +++ b/bittorrent.cabal | |||
@@ -43,7 +43,6 @@ library | |||
43 | hs-source-dirs: src | 43 | hs-source-dirs: src |
44 | exposed-modules: Data.Torrent | 44 | exposed-modules: Data.Torrent |
45 | -- Data.Torrent.Bitfield | 45 | -- Data.Torrent.Bitfield |
46 | Data.Torrent.Block | ||
47 | Data.Torrent.Client | 46 | Data.Torrent.Client |
48 | Data.Torrent.InfoHash | 47 | Data.Torrent.InfoHash |
49 | Data.Torrent.Layout | 48 | Data.Torrent.Layout |
@@ -61,6 +60,7 @@ library | |||
61 | -- Network.BitTorrent.DHT.Session | 60 | -- Network.BitTorrent.DHT.Session |
62 | -- Network.BitTorrent.Exchange | 61 | -- Network.BitTorrent.Exchange |
63 | -- Network.BitTorrent.Exchange.Assembler | 62 | -- Network.BitTorrent.Exchange.Assembler |
63 | Network.BitTorrent.Exchange.Block | ||
64 | Network.BitTorrent.Exchange.Message | 64 | Network.BitTorrent.Exchange.Message |
65 | -- Network.BitTorrent.Exchange.Session | 65 | -- Network.BitTorrent.Exchange.Session |
66 | Network.BitTorrent.Exchange.Status | 66 | Network.BitTorrent.Exchange.Status |
diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs index 7ed8679d..a32d74fa 100644 --- a/src/Data/Torrent/Layout.hs +++ b/src/Data/Torrent/Layout.hs | |||
@@ -81,8 +81,6 @@ import Text.PrettyPrint.Class | |||
81 | import System.FilePath | 81 | import System.FilePath |
82 | import System.Posix.Types | 82 | import System.Posix.Types |
83 | 83 | ||
84 | import Data.Torrent.Block | ||
85 | |||
86 | 84 | ||
87 | {----------------------------------------------------------------------- | 85 | {----------------------------------------------------------------------- |
88 | -- File attribytes | 86 | -- File attribytes |
@@ -274,7 +272,7 @@ fileCount MultiFile {..} = L.length liFiles | |||
274 | 272 | ||
275 | -- | Find number of blocks of the specified size. If torrent size is | 273 | -- | Find number of blocks of the specified size. If torrent size is |
276 | -- not a multiple of block size then the count is rounded up. | 274 | -- not a multiple of block size then the count is rounded up. |
277 | blockCount :: BlockSize -> LayoutInfo -> Int | 275 | blockCount :: Int -> LayoutInfo -> Int |
278 | blockCount blkSize ci = contentLength ci `sizeInBase` blkSize | 276 | blockCount blkSize ci = contentLength ci `sizeInBase` blkSize |
279 | 277 | ||
280 | {----------------------------------------------------------------------- | 278 | {----------------------------------------------------------------------- |
diff --git a/src/Data/Torrent/Block.hs b/src/Network/BitTorrent/Exchange/Block.hs index 88f7f352..e99dd49d 100644 --- a/src/Data/Torrent/Block.hs +++ b/src/Network/BitTorrent/Exchange/Block.hs | |||
@@ -12,7 +12,7 @@ | |||
12 | {-# LANGUAGE DeriveFunctor #-} | 12 | {-# LANGUAGE DeriveFunctor #-} |
13 | {-# LANGUAGE DeriveDataTypeable #-} | 13 | {-# LANGUAGE DeriveDataTypeable #-} |
14 | {-# LANGUAGE GeneralizedNewtypeDeriving #-} | 14 | {-# LANGUAGE GeneralizedNewtypeDeriving #-} |
15 | module Data.Torrent.Block | 15 | module Network.BitTorrent.Exchange.Block |
16 | ( -- * Block attributes | 16 | ( -- * Block attributes |
17 | BlockOffset | 17 | BlockOffset |
18 | , BlockCount | 18 | , BlockCount |
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs index 2f85d729..8a88b761 100644 --- a/src/Network/BitTorrent/Exchange/Message.hs +++ b/src/Network/BitTorrent/Exchange/Message.hs | |||
@@ -90,10 +90,10 @@ import Text.PrettyPrint as PP | |||
90 | import Text.PrettyPrint.Class | 90 | import Text.PrettyPrint.Class |
91 | 91 | ||
92 | import Data.Torrent.Bitfield | 92 | import Data.Torrent.Bitfield |
93 | import Data.Torrent.Block | ||
94 | import Data.Torrent.InfoHash | 93 | import Data.Torrent.InfoHash |
95 | import Network.BitTorrent.Core.PeerId | 94 | import Network.BitTorrent.Core.PeerId |
96 | import Network.BitTorrent.Core.PeerAddr () | 95 | import Network.BitTorrent.Core.PeerAddr () |
96 | import Network.BitTorrent.Exchange.Block | ||
97 | 97 | ||
98 | {----------------------------------------------------------------------- | 98 | {----------------------------------------------------------------------- |
99 | -- Extensions | 99 | -- Extensions |