Merge branch 'master' into new-torrent

server/cmd/main.go

@@ -41,6 +41,8 @@ func (args) Version() string {
 var params args
 
 func main() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+
 	arg.MustParse(&params)
 
 	if params.Path == "" {
@@ -56,6 +58,7 @@ func main() {
 	log.Init(params.LogPath, params.WebLogPath)
 	fmt.Println("=========== START ===========")
 	fmt.Println("TorrServer", version.Version+",", runtime.Version())
+	fmt.Println("CPU Num:", runtime.NumCPU())
 	if params.HttpAuth {
 		log.TLogln("Use HTTP Auth file", settings.Path+"/accs.db")
 	}

server/dlna/dlna.go

@@ -8,6 +8,7 @@ import (
 	"os/user"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"time"
 
 	"github.com/anacrolix/dms/dlna/dms"
@@ -37,7 +38,20 @@ func Start() {
 			return
 		}(),
 		HTTPConn: func() net.Listener {
-			conn, err := net.Listen("tcp", ":9080")
+			port := 9080
+			for {
+				log.TLogln("Check dlna port", port)
+				m, err := net.Listen("tcp", ":"+strconv.Itoa(port))
+				if m != nil {
+					m.Close()
+				}
+				if err == nil {
+					break
+				}
+				port++
+			}
+			log.TLogln("Set dlna port", port)
+			conn, err := net.Listen("tcp", ":"+strconv.Itoa(port))
 			if err != nil {
 				log.TLogln(err)
 				os.Exit(1)

server/settings/btsets.go

@@ -121,9 +121,8 @@ func loadBTSets() {
 func SetDefault() {
 	sets := new(BTSets)
 	sets.EnableDebug = false
-	sets.DisableUTP = true
-	sets.CacheSize = 96 * 1024 * 1024 // 96 MB
-	sets.PreloadCache = 0
+	sets.CacheSize = 64 * 1024 * 1024 // 64 MB
+	sets.PreloadCache = 50
 	sets.ConnectionsLimit = 23
 	sets.RetrackersMode = 1
 	sets.TorrentDisconnectTimeout = 30

server/version/version.go

@@ -1,3 +1,4 @@
 package version
 
-const Version = "MatriX.109.NE1.38"
+
+const Version = "MatriX.110.NE1.39"

server/web/api/torrents.go

@@ -4,7 +4,9 @@ import (
 	"net/http"
 	"strings"
 
+	"server/dlna"
 	"server/log"
+	set "server/settings"
 	"server/torr"
 	"server/torr/state"
 	"server/web/api/utils"
@@ -103,7 +105,11 @@ func addTorrent(req torrReqJS, c *gin.Context) {
 			torr.SaveTorrentToDB(tor)
 		}
 	}()
-
+	// TODO: remove
+	if set.BTsets.EnableDLNA {
+		dlna.Stop()
+		dlna.Start()
+	}
 	c.JSON(200, tor.Status())
 }
 
@@ -137,6 +143,11 @@ func remTorrent(req torrReqJS, c *gin.Context) {
 		return
 	}
 	torr.RemTorrent(req.Hash)
+	// TODO: remove
+	if set.BTsets.EnableDLNA {
+		dlna.Stop()
+		dlna.Start()
+	}
 	c.Status(200)
 }