sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-21 14:36:09 +05:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YouROK
2020-11-10 22:57:16 +03:00
parent 6a11651cf5
commit 1ce27ef121
12 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/torr/state/state.go
View File

@@ -31,6 +31,9 @@ const (
)
type TorrentStats struct {
Title string `json:"title"`
Poster string `json:"poster"`
Name string `json:"name,omitempty"`
Hash string `json:"hash,omitempty"`

4
src/server/torr/stream.go
View File

@@ -12,10 +12,10 @@ import (
func (t *Torrent) Stream(fileIndex int, req *http.Request, resp http.ResponseWriter) error {
files := t.Files()
if fileIndex < 0 || fileIndex >= len(files) {
if fileIndex < 1 || fileIndex > len(files) {
return errors.New("file index out of range")
}
file := files[fileIndex]
file := files[fileIndex-1]
reader := t.NewReader(file, 0)
log.Println("Connect client")

22
src/server/torr/torrent.go
View File

@@ -42,8 +42,6 @@ type Torrent struct {
PreloadSize int64
PreloadedBytes int64
hash metainfo.Hash
expiredTime time.Time
closed <-chan struct{}
@@ -80,6 +78,7 @@ func NewTorrent(spec *torrent.TorrentSpec, bt *BTServer) (*Torrent, error) {
torr.bt = bt
torr.closed = goTorrent.Closed()
torr.TorrentSpec = spec
torr.expiredTime = time.Now().Add(time.Minute)
go torr.watch()
@@ -97,7 +96,7 @@ func (t *Torrent) WaitInfo() bool {
select {
case <-t.Torrent.GotInfo():
t.cache = t.bt.storage.GetCache(t.hash)
t.cache = t.bt.storage.GetCache(t.Hash())
return true
case <-t.closed:
return false
@@ -192,7 +191,13 @@ func (t *Torrent) Files() []*torrent.File {
}
func (t *Torrent) Hash() metainfo.Hash {
return t.hash
if t.Torrent != nil {
t.Torrent.InfoHash()
}
if t.TorrentSpec != nil {
return t.TorrentSpec.InfoHash
}
return [20]byte{}
}
func (t *Torrent) Length() int64 {
@@ -329,8 +334,8 @@ func (t *Torrent) Close() {
t.bt.mu.Lock()
defer t.bt.mu.Unlock()
if _, ok := t.bt.torrents[t.hash]; ok {
delete(t.bt.torrents, t.hash)
if _, ok := t.bt.torrents[t.Hash()]; ok {
delete(t.bt.torrents, t.Hash())
}
t.drop()
@@ -344,6 +349,9 @@ func (t *Torrent) Stats() *state.TorrentStats {
st.TorrentStatus = t.Status
st.TorrentStatusString = t.Status.String()
st.Title = t.Title
st.Poster = t.Poster
if t.TorrentSpec != nil {
st.Hash = t.TorrentSpec.InfoHash.HexString()
}
@@ -383,7 +391,7 @@ func (t *Torrent) Stats() *state.TorrentStats {
for i, f := range files {
st.FileStats = append(st.FileStats, state.TorrentFileStat{
Id: i,
Id: i + 1,
Path: f.Path(),
Length: f.Length(),
})