1 files changed, 9 insertions, 2 deletions

diff --git a/src/System/Torrent/Storage.hs b/src/System/Torrent/Storage.hs
index bf44d7bf..214998a9 100644
--- a/src/System/Torrent/Storage.hs
+++ b/src/System/Torrent/Storage.hs
@@ -34,6 +34,7 @@ module System.Torrent.Storage
          -- * Modification
        , writePiece
        , readPiece
+       , hintRead
        , unsafeReadPiece
        ) where
 
@@ -45,7 +46,7 @@ import Data.Typeable
 import Data.Torrent.Bitfield
 import Data.Torrent.Layout
 import Data.Torrent.Piece
-import System.Torrent.FileMap
+import System.Torrent.FileMap as FM
 
 
 data StorageFailure
@@ -82,7 +83,9 @@ withStorage :: Mode -> PieceSize -> FileLayout FileSize
 withStorage m s l = bracket (open m s l) close
 
 isValidIx :: PieceIx -> Storage -> Bool
-isValidIx i s = 0 <= i && i < undefined s
+isValidIx i Storage {..} = 0 <= i && i < pcount
+  where
+    pcount = FM.size fileMap `sizeInBase` pieceLen
 
 writePiece :: Piece BL.ByteString -> Storage -> IO ()
 writePiece p @ Piece {..} s @ Storage {..}
@@ -101,6 +104,10 @@ readPiece pix s @ Storage {..}
     offset = fromIntegral pix * fromIntegral pieceLen
     sz     = fromIntegral pieceLen
 
+-- | Hint about the coming 'readPiece'.
+hintRead :: PieceIx -> Storage -> IO ()
+hintRead _pix Storage {..} = return ()
+
 unsafeReadPiece :: PieceIx -> Storage -> IO (Piece BL.ByteString)
 unsafeReadPiece pix s @ Storage {..}
   | not (isValidIx pix s) = throwIO (InvalidIndex pix)