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

Merge branch 'master' into old-engine

Browse Source
This commit is contained in:
nikk gitanes
2023-10-31 05:06:34 +03:00
parent 95d2a92381 1e7228550b
commit 77af528f92
4 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/torr/torrent.go
View File

@@ -198,11 +198,10 @@ func (t *Torrent) updateRA() {
if t.Torrent != nil && t.Torrent.Info() != nil {
pieceLen := t.Torrent.Info().PieceLength
adj := pieceLen * int64(t.Torrent.Stats().ActivePeers) / int64(1+t.cache.Readers())
switch {
case adj < pieceLen:
if adj < pieceLen {
adj = pieceLen
case adj > pieceLen*4:
adj = pieceLen * 4
//} else if adj > pieceLen*4 {
// adj = pieceLen * 4
}
go t.cache.AdjustRA(adj)
}

9
server/web/api/m3u.go
View File

@@ -40,6 +40,7 @@ func allPlayList(c *gin.Context) {
// http://127.0.0.1:8090/playlist?hash=...
// http://127.0.0.1:8090/playlist?hash=...&fromlast
// http://127.0.0.1:8090/playlist/fname?hash=...
func playList(c *gin.Context) {
hash, _ := c.GetQuery("hash")
_, fromlast := c.GetQuery("fromlast")
@@ -65,8 +66,14 @@ func playList(c *gin.Context) {
host := utils.GetScheme(c) + "://" + c.Request.Host
list := getM3uList(tor.Status(), host, fromlast)
list = "#EXTM3U\n" + list
name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param
if name == "" {
name = tor.Name() + ".m3u"
} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
name += ".m3u"
}
sendM3U(c, tor.Name()+".m3u", tor.Hash().HexString(), list)
sendM3U(c, name, tor.Hash().HexString(), list)
}
func sendM3U(c *gin.Context, name, hash string, m3u string) {

17
server/web/api/stream.go
View File

@@ -4,6 +4,7 @@ import (
"net/http"
"net/url"
"strconv"
"strings"
"server/torr"
"server/torr/state"
@@ -120,8 +121,14 @@ func stream(c *gin.Context) {
} else
// return m3u if query
if m3u {
name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param
if name == "" {
name = tor.Name() + ".m3u"
} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
name += ".m3u"
}
m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast)
sendM3U(c, tor.Name()+".m3u", tor.Hash().HexString(), m3ulist)
sendM3U(c, name, tor.Hash().HexString(), m3ulist)
return
} else
// return play if query
@@ -200,8 +207,14 @@ func streamNoAuth(c *gin.Context) {
// return m3u if query
if m3u {
name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param
if name == "" {
name = tor.Name() + ".m3u"
} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
name += ".m3u"
}
m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast)
sendM3U(c, tor.Name()+".m3u", tor.Hash().HexString(), m3ulist)
sendM3U(c, name, tor.Hash().HexString(), m3ulist)
return
} else
// return play if query