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

add m3u8 check in fname

Browse Source 
and handle missing fname in streamNoAuth also
This commit is contained in:
nikk gitanes
2023-10-31 02:33:46 +03:00
parent c1e3b64426
commit 1e7228550b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ func playList(c *gin.Context) {
name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param
if name == "" { if name == "" {
name = tor.Name() + ".m3u" name = tor.Name() + ".m3u"
} else { } else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
name += ".m3u" name += ".m3u"
} }

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

@@ -124,7 +124,7 @@ func stream(c *gin.Context) {
name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param name := strings.ReplaceAll(c.Param("fname"), `/`, "") // strip starting / from param
if name == "" { if name == "" {
name = tor.Name() + ".m3u" name = tor.Name() + ".m3u"
} else if !strings.HasSuffix(strings.ToLower(name), ".m3u") { } else if !strings.HasSuffix(strings.ToLower(name), ".m3u") && !strings.HasSuffix(strings.ToLower(name), ".m3u8") {
name += ".m3u" name += ".m3u"
} }
m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast) m3ulist := "#EXTM3U\n" + getM3uList(tor.Status(), utils2.GetScheme(c)+"://"+c.Request.Host, fromlast)
@@ -207,8 +207,14 @@ func streamNoAuth(c *gin.Context) {
// return m3u if query // return m3u if query
if m3u { 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) 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 return
} else } else
// return play if query // return play if query