Merge branch 'master' into new-torrent

server/web/api/settings.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
+	"server/dlna"
 
 	sets "server/settings"
 	"server/torr"
@@ -29,10 +30,15 @@ func settings(c *gin.Context) {
 		return
 	} else if req.Action == "set" {
 		torr.SetSettings(req.Sets)
+		dlna.Stop()
+		if req.Sets.EnableDLNA {
+			dlna.Start()
+		}
 		c.Status(200)
 		return
 	} else if req.Action == "def" {
 		torr.SetDefSettings()
+		dlna.Stop()
 		c.Status(200)
 		return
 	}

server/web/server.go

@@ -6,6 +6,8 @@ import (
 	"github.com/gin-contrib/cors"
 	"github.com/gin-contrib/location"
 	"github.com/gin-gonic/gin"
+	"server/dlna"
+	"server/settings"
 
 	"server/log"
 	"server/torr"
@@ -51,6 +53,9 @@ func Start(port string) {
 		api.SetupRoute(&route.RouterGroup)
 		pages.SetupRoute(&route.RouterGroup)
 	}
+	if settings.BTsets.EnableDLNA {
+		dlna.Start()
+	}
 	log.TLogln("Start web server at port", port)
 	waitChan <- route.Run(":" + port)
 }
@@ -60,6 +65,7 @@ func Wait() error {
 }
 
 func Stop() {
+	dlna.Stop()
 	BTS.Disconnect()
 	waitChan <- nil
 }