From 70df67555bfe1fb408f3d276826f6ee16e2f8e58 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 9 Apr 2019 12:53:18 +1000 Subject: [PATCH] Improve some types in reader.readOnceAt --- reader.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/reader.go b/reader.go index a5ea62f2..648228be 100644 --- a/reader.go +++ b/reader.go @@ -8,7 +8,6 @@ import ( "sync" "github.com/anacrolix/missinggo" - "github.com/anacrolix/torrent/peer_protocol" ) type Reader interface { @@ -213,8 +212,8 @@ func (r *reader) readOnceAt(b []byte, pos int64, ctxErr *error) (n int, err erro return } } - pi := peer_protocol.Integer(r.torrentOffset(pos) / r.t.info.PieceLength) - ip := r.t.info.Piece(int(pi)) + pi := pieceIndex(r.torrentOffset(pos) / r.t.info.PieceLength) + ip := r.t.info.Piece(pi) po := r.torrentOffset(pos) % r.t.info.PieceLength b1 := missinggo.LimitLen(b, ip.Length()-po, avail) n, err = r.t.readAt(b1, r.torrentOffset(pos)) @@ -225,7 +224,7 @@ func (r *reader) readOnceAt(b []byte, pos int64, ctxErr *error) (n int, err erro r.t.cl.lock() // TODO: Just reset pieces in the readahead window. This might help // prevent thrashing with small caches and file and piece priorities. - log.Printf("error reading torrent %s piece %d offset %d, %d bytes: %s", + log.Printf("error reading torrent %s piece %d offset %d, %d bytes: %v", r.t.infoHash.HexString(), pi, po, len(b1), err) r.t.updateAllPieceCompletions() r.t.updateAllPiecePriorities() -- 2.51.0