add cache

This commit is contained in:
YouROK
2020-12-07 15:55:54 +03:00
parent 30604c6e94
commit a5c1d5b4de
7 changed files with 142 additions and 8 deletions

View File

@@ -61,7 +61,7 @@ type TorrentStatus struct {
PiecesDirtiedGood int64 `json:"pieces_dirtied_good,omitempty"`
PiecesDirtiedBad int64 `json:"pieces_dirtied_bad,omitempty"`
FileStats []TorrentFileStat `json:"file_stats,omitempty"`
FileStats []*TorrentFileStat `json:"file_stats,omitempty"`
}
type TorrentFileStat struct {

View File

@@ -0,0 +1,18 @@
package state
type CacheState struct {
Hash string
Capacity int64
Filled int64
PiecesLength int64
PiecesCount int
DownloadSpeed float64
Pieces map[int]ItemState
}
type ItemState struct {
Id int
Length int64
Size int64
Completed bool
}

View File

@@ -6,6 +6,7 @@ import (
"server/log"
"server/settings"
"server/torr/storage/state"
"server/torr/utils"
"github.com/anacrolix/torrent"
@@ -53,7 +54,7 @@ func NewCache(capacity int64, storage *Storage) *Cache {
}
func (c *Cache) Init(info *metainfo.Info, hash metainfo.Hash) {
log.TLogln("Create cache for:", info.Name)
log.TLogln("Create cache for:", info.Name, hash.HexString())
if c.capacity == 0 {
c.capacity = info.PieceLength * 6
}
@@ -204,3 +205,35 @@ func (c *Cache) AdjustRA(readahead int64) {
r.SetReadahead(readahead)
}
}
func (c *Cache) GetState() *state.CacheState {
cState := new(state.CacheState)
cState.Capacity = c.capacity
cState.PiecesLength = c.pieceLength
cState.PiecesCount = c.pieceCount
cState.Hash = c.hash.HexString()
stats := make(map[int]state.ItemState, 0)
c.muPiece.Lock()
var fill int64 = 0
for _, p := range c.pieces {
if p.Size > 0 {
fill += p.Length
stats[p.Id] = state.ItemState{
Id: p.Id,
Size: p.Size,
Length: p.Length,
Completed: p.complete,
}
}
}
c.filled = fill
c.muPiece.Unlock()
cState.Filled = c.filled
cState.Pieces = stats
return cState
}
func (c *Cache) GetCapacity() int64 {
return c.capacity
}

View File

@@ -9,6 +9,7 @@ import (
"server/log"
"server/settings"
"server/torr/state"
cacheSt "server/torr/storage/state"
"server/torr/utils"
utils2 "server/utils"
@@ -258,10 +259,10 @@ func (t *Torrent) Preload(index int, size int64) {
}
}()
if index < 0 || index >= len(t.Files()) {
index = 0
file := t.findFileIndex(index)
if file == nil {
file = t.Files()[0]
}
file := t.Files()[index]
buff5mb := int64(5 * 1024 * 1024)
startPreloadLength := size
@@ -393,7 +394,7 @@ func (t *Torrent) Status() *state.TorrentStatus {
return files[i].Path() < files[j].Path()
})
for i, f := range files {
st.FileStats = append(st.FileStats, state.TorrentFileStat{
st.FileStats = append(st.FileStats, &state.TorrentFileStat{
Id: i + 1,
Path: f.Path(),
Length: f.Length(),
@@ -403,3 +404,32 @@ func (t *Torrent) Status() *state.TorrentStatus {
}
return st
}
func (t *Torrent) CacheState() *cacheSt.CacheState {
if t.Torrent != nil && t.cache != nil {
st := t.cache.GetState()
st.DownloadSpeed = t.DownloadSpeed
return st
}
return nil
}
func (t *Torrent) findFileIndex(index int) *torrent.File {
st := t.Status()
var stFile *state.TorrentFileStat
for _, f := range st.FileStats {
if index == f.Id {
stFile = f
break
}
}
if stFile == nil {
return nil
}
for _, file := range t.Files() {
if file.Path() == stFile.Path {
return file
}
}
return nil
}

View File

@@ -78,8 +78,8 @@ func GetMimeType(filename string) string {
return "*/*"
}
func GetPlayableFiles(st state.TorrentStatus) []state.TorrentFileStat {
files := make([]state.TorrentFileStat, 0)
func GetPlayableFiles(st state.TorrentStatus) []*state.TorrentFileStat {
files := make([]*state.TorrentFileStat, 0)
for _, f := range st.FileStats {
if GetMimeType(f.Path) != "*/*" {
files = append(files, f)

View File

@@ -0,0 +1,51 @@
package api
import (
"net/http"
"server/torr"
"github.com/gin-gonic/gin"
"github.com/pkg/errors"
)
//Action: get
type cacheReqJS struct {
requestI
Hash string `json:"hash,omitempty"`
}
func cache(c *gin.Context) {
var req cacheReqJS
err := c.ShouldBindJSON(&req)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
}
c.Status(http.StatusBadRequest)
switch req.Action {
case "get":
{
getCache(req, c)
}
}
}
func getCache(req cacheReqJS, c *gin.Context) {
if req.Hash == "" {
c.AbortWithError(http.StatusBadRequest, errors.New("hash is empty"))
return
}
tor := torr.GetTorrent(req.Hash)
if tor != nil {
st := tor.CacheState()
if st == nil {
c.JSON(200, struct{}{})
} else {
c.JSON(200, st)
}
} else {
c.Status(http.StatusNotFound)
}
}

View File

@@ -23,6 +23,8 @@ func SetupRoute(route *gin.Engine) {
route.POST("/torrents", torrents)
route.POST("/torrent/upload", torrentUpload)
route.POST("/cache", cache)
route.GET("/stream", stream)
route.GET("/stream/*fname", stream)