update

src/server/torr/reader.go

@@ -15,6 +15,8 @@ type Reader struct {
 	file      *torrent.File
 	torr      *Torrent
 
+	isClosed bool
+
 	///Preload
 	isPreload         bool
 	endOffsetPreload  int64
@@ -69,11 +71,16 @@ func (r *Reader) Readahead() int64 {
 	return r.readahead
 }
 
+func (r *Reader) Close() error {
+	r.isClosed = true
+	return r.Reader.Close()
+}
+
 func (r *Reader) preload() {
 	r.currOffsetPreload = r.offset
 	capacity := r.torr.cache.GetCapacity()
 	plength := r.torr.Info().PieceLength
-	r.endOffsetPreload = r.offset + capacity - r.readahead - plength
+	r.endOffsetPreload = r.offset + capacity - r.readahead - plength*3
 	if r.endOffsetPreload > r.file.Length() {
 		r.endOffsetPreload = r.file.Length()
 	}
@@ -93,14 +100,13 @@ func (r *Reader) preload() {
 		buffReader.SetReadahead(0)
 		buffReader.Seek(r.currOffsetPreload, io.SeekStart)
 		buff5mb := make([]byte, 1024)
-		for r.currOffsetPreload < r.endOffsetPreload {
+		for r.currOffsetPreload < r.endOffsetPreload && !r.isClosed {
 			off, err := buffReader.Read(buff5mb)
 			if err != nil {
 				log.TLogln("Error read e head buffer", err)
 				return
 			}
 			r.currOffsetPreload += int64(off)
-			fmt.Println("buffered:", r.offset, "|", r.currOffsetPreload, "/", r.endOffsetPreload)
 		}
 	}()
 }

src/server/torr/storage/torrstor/piece.go

@@ -56,7 +56,7 @@ func (p *Piece) ReadAt(b []byte, off int64) (n int, err error) {
 		}
 	}
 	if len(p.buffer) < int(off) || len(p.buffer) < int(off)+size {
-		return 0, io.ErrUnexpectedEOF
+		return 0, io.EOF
 	}
 	n = copy(b, p.buffer[int(off) : int(off)+size][:])
 	p.accessed = time.Now().Unix()
@@ -66,6 +66,9 @@ func (p *Piece) ReadAt(b []byte, off int64) (n int, err error) {
 	if int64(len(b))+off >= p.Size {
 		go p.cache.cleanPieces()
 	}
+	if n == 0 && err == nil {
+		return 0, io.EOF
+	}
 	return n, nil
 }
 

src/server/torr/stream.go

@@ -29,7 +29,7 @@ func (t *Torrent) Stream(fileIndex int, req *http.Request, resp http.ResponseWri
 
 	http.ServeContent(resp, req, file.Path(), time.Time{}, reader)
 
-	log.Println("Disconnect client")
 	t.CloseReader(reader)
+	log.Println("Disconnect client")
 	return nil
 }

src/server/version/version.go

@@ -1,4 +1,4 @@
 package version
 
-const Version = "1.2.78_1"
+const Version = "1.2.78_3"
 const VerInt = 78