From 49caf0e42deea742884ea67cc8c3d570ddbf378c Mon Sep 17 00:00:00 2001
From: YouROK <8yourok8@mail.ru>
Date: Wed, 8 Sep 2021 23:08:08 +0300
Subject: [PATCH] refactor

---
 server/web/api/route.go        |  6 ------
 server/web/{api => msx}/msx.go | 14 ++++++++++----
 server/web/msx/route.go        | 10 ++++++++++
 server/web/server.go           |  3 +++
 4 files changed, 23 insertions(+), 10 deletions(-)
 rename server/web/{api => msx}/msx.go (94%)
 create mode 100644 server/web/msx/route.go

diff --git a/server/web/api/route.go b/server/web/api/route.go
index 0a4c3be..0e33dd4 100644
--- a/server/web/api/route.go
+++ b/server/web/api/route.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	sets "server/settings"
 	"server/torr"
 )
@@ -38,11 +37,6 @@ func SetupRoute(route *gin.RouterGroup) {
 	route.GET("/playlistall/all.m3u", allPlayList)
 	route.GET("/playlist", 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) {
diff --git a/server/web/api/msx.go b/server/web/msx/msx.go
similarity index 94%
rename from server/web/api/msx.go
rename to server/web/msx/msx.go
index 2728bbf..3891d73 100644
--- a/server/web/api/msx.go
+++ b/server/web/msx/msx.go
@@ -1,4 +1,4 @@
-package api
+package msx
 
 import (
 	"fmt"
@@ -16,8 +16,11 @@ import (
 )
 
 type msxMenu struct {
-	Logo string        `json:"logo,omitempty"`
-	Menu []msxMenuItem `json:"menu"`
+	Logo    string        `json:"logo,omitempty"`
+	Reuse   bool          `json:"reuse"`
+	Cache   bool          `json:"cache"`
+	Restore bool          `json:"restore"`
+	Menu    []msxMenuItem `json:"menu"`
 }
 
 type msxMenuItem struct {
@@ -76,7 +79,10 @@ func msxTorrents(c *gin.Context) {
 	}
 
 	c.JSON(200, msxMenu{
-		Logo: logo,
+		Logo:    logo,
+		Cache:   false,
+		Reuse:   false,
+		Restore: false,
 		Menu: []msxMenuItem{
 			// Main page
 			{
diff --git a/server/web/msx/route.go b/server/web/msx/route.go
new file mode 100644
index 0000000..61f6fee
--- /dev/null
+++ b/server/web/msx/route.go
@@ -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)
+}
diff --git a/server/web/server.go b/server/web/server.go
index 6aefd27..76bee9c 100644
--- a/server/web/server.go
+++ b/server/web/server.go
@@ -8,6 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"server/dlna"
 	"server/settings"
+	"server/web/msx"
 
 	"server/log"
 	"server/torr"
@@ -48,9 +49,11 @@ func Start(port string) {
 	routeAuth := auth.SetupAuth(route)
 	if routeAuth != nil {
 		api.SetupRoute(routeAuth)
+		msx.SetupRoute(routeAuth)
 		pages.SetupRoute(routeAuth)
 	} else {
 		api.SetupRoute(&route.RouterGroup)
+		msx.SetupRoute(&route.RouterGroup)
 		pages.SetupRoute(&route.RouterGroup)
 	}
 	if settings.BTsets.EnableDLNA {