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

Merge branch 'master' of https://github.com/YouROK/TorrServer

Browse Source
This commit is contained in:
nikk gitanes
2021-09-08 23:37:20 +03:00
parent 2b1e565c58 5b28e0d68b
commit a7ce1c8110
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/web/api/route.go
View File

@@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
sets "server/settings" sets "server/settings"
"server/torr" "server/torr"
) )
@@ -38,11 +37,6 @@ func SetupRoute(route *gin.RouterGroup) {
route.GET("/playlistall/all.m3u", allPlayList) route.GET("/playlistall/all.m3u", allPlayList)
route.GET("/playlist", playList) route.GET("/playlist", playList)
route.GET("/playlist/*fname", playList) route.GET("/playlist/*fname", playList)
route.GET("/msx/start.json", msxStart)
route.GET("/msx/torrents", msxTorrents)
route.GET("/msx/playlist", msxPlaylist)
route.GET("/msx/playlist/*fname", msxPlaylist)
} }
func shutdown(c *gin.Context) { func shutdown(c *gin.Context) {

14
server/web/api/msx.go → server/web/msx/msx.go
View File

@@ -1,4 +1,4 @@
package api package msx
import ( import (
"fmt" "fmt"
@@ -16,8 +16,11 @@ import (
) )
type msxMenu struct { type msxMenu struct {
Logo string `json:"logo,omitempty"` Logo string `json:"logo,omitempty"`
Menu []msxMenuItem `json:"menu"` Reuse bool `json:"reuse"`
Cache bool `json:"cache"`
Restore bool `json:"restore"`
Menu []msxMenuItem `json:"menu"`
} }
type msxMenuItem struct { type msxMenuItem struct {
@@ -76,7 +79,10 @@ func msxTorrents(c *gin.Context) {
} }
c.JSON(200, msxMenu{ c.JSON(200, msxMenu{
Logo: logo, Logo: logo,
Cache: false,
Reuse: false,
Restore: false,
Menu: []msxMenuItem{ Menu: []msxMenuItem{
// Main page // Main page
{ {

10
server/web/msx/route.go Normal file
View File

@@ -0,0 +1,10 @@
package msx
import "github.com/gin-gonic/gin"
func SetupRoute(route *gin.RouterGroup) {
route.GET("/msx/start.json", msxStart)
route.GET("/msx/torrents", msxTorrents)
route.GET("/msx/playlist", msxPlaylist)
route.GET("/msx/playlist/*fname", msxPlaylist)
}

3
server/web/server.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"server/dlna" "server/dlna"
"server/settings" "server/settings"
"server/web/msx"
"server/log" "server/log"
"server/torr" "server/torr"
@@ -48,9 +49,11 @@ func Start(port string) {
routeAuth := auth.SetupAuth(route) routeAuth := auth.SetupAuth(route)
if routeAuth != nil { if routeAuth != nil {
api.SetupRoute(routeAuth) api.SetupRoute(routeAuth)
msx.SetupRoute(routeAuth)
pages.SetupRoute(routeAuth) pages.SetupRoute(routeAuth)
} else { } else {
api.SetupRoute(&route.RouterGroup) api.SetupRoute(&route.RouterGroup)
msx.SetupRoute(&route.RouterGroup)
pages.SetupRoute(&route.RouterGroup) pages.SetupRoute(&route.RouterGroup)
} }
if settings.BTsets.EnableDLNA { if settings.BTsets.EnableDLNA {