Merge branch 'master' into old-engine

server/cmd/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -127,7 +126,7 @@ func watchTDir(dir string) {
 		path = dir
 	}
 	for {
-		files, err := ioutil.ReadDir(path)
+		files, err := os.ReadDir(path)
 		if err == nil {
 			for _, file := range files {
 				filename := filepath.Join(path, file.Name())

server/log/log.go

@@ -3,7 +3,7 @@ package log
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"strings"
@@ -93,8 +93,8 @@ func WebLogger() gin.HandlerFunc {
 		body := ""
 		// save body if not form or file
 		if !strings.HasPrefix(c.Request.Header.Get("Content-Type"), "multipart/form-data") {
-			body, _ := ioutil.ReadAll(c.Request.Body)
-			c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+			body, _ := io.ReadAll(c.Request.Body)
+			c.Request.Body = io.NopCloser(bytes.NewBuffer(body))
 		} else {
 			body = "body hidden, too large"
 		}

server/server.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -36,7 +35,7 @@ func cleanCache() {
 		return
 	}
 
-	dirs, err := ioutil.ReadDir(settings.BTsets.TorrentsSavePath)
+	dirs, err := os.ReadDir(settings.BTsets.TorrentsSavePath)
 	if err != nil {
 		return
 	}
@@ -68,7 +67,7 @@ func cleanCache() {
 }
 
 func removeAllFiles(path string) {
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		return
 	}

server/torr/apihelper.go

@@ -2,7 +2,6 @@ package torr
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -143,7 +142,7 @@ func RemTorrent(hashHex string) {
 	hash := metainfo.NewHashFromHex(hashHex)
 	if sets.BTsets.UseDisk && hashHex != "" && hashHex != "/" {
 		name := filepath.Join(sets.BTsets.TorrentsSavePath, hashHex)
-		ff, _ := ioutil.ReadDir(name)
+		ff, _ := os.ReadDir(name)
 		for _, f := range ff {
 			os.Remove(filepath.Join(name, f.Name()))
 		}

server/torr/btserver.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 	"net"
-	"strconv"
 	"sync"
 
 	"github.com/anacrolix/publicip"
@@ -131,20 +130,21 @@ func (bt *BTServer) configure(ctx context.Context) {
 			log.Println("Set listen port", settings.BTsets.PeersListenPort)
 			bt.config.ListenPort = settings.BTsets.PeersListenPort
 		} else {
-			lport := 32000
-			for {
-				log.Println("Check listen port", lport)
-				l, err := net.Listen("tcp", ":"+strconv.Itoa(lport))
-				if l != nil {
-					l.Close()
-				}
-				if err == nil {
-					break
-				}
-				lport++
-			}
-			log.Println("Set listen port", lport)
-			bt.config.ListenPort = lport
+			// lport := 32000
+			// for {
+			// 	log.Println("Check listen port", lport)
+			// 	l, err := net.Listen("tcp", ":"+strconv.Itoa(lport))
+			// 	if l != nil {
+			// 		l.Close()
+			// 	}
+			// 	if err == nil {
+			// 		break
+			// 	}
+			// 	lport++
+			// }
+			// log.Println("Set listen port", lport)
+			log.Println("Set listen port to random autoselect (0)")
+			bt.config.ListenPort = 0 // lport
 		}
 	}
 

server/torr/utils/blockedIP.go

@@ -2,7 +2,7 @@ package utils
 
 import (
 	"bufio"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -12,7 +12,7 @@ import (
 )
 
 func ReadBlockedIP() (ranger iplist.Ranger, err error) {
-	buf, err := ioutil.ReadFile(filepath.Join(settings.Path, "blocklist"))
+	buf, err := os.ReadFile(filepath.Join(settings.Path, "blocklist"))
 	if err != nil {
 		return nil, err
 	}

server/torr/utils/torrent.go

@@ -2,9 +2,10 @@ package utils
 
 import (
 	"encoding/base32"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net/http"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -14,7 +15,7 @@ import (
 )
 
 var defTrackers = []string{
-	"http://retracker.local",
+	"http://retracker.local/announce",
 	"http://bt4.t-ru.org/ann?magnet",
 	"http://retracker.mgts.by:80/announce",
 	"http://tracker.city9x.com:2710/announce",
@@ -34,7 +35,7 @@ var loadedTrackers []string
 
 func GetTrackerFromFile() []string {
 	name := filepath.Join(settings.Path, "trackers.txt")
-	buf, err := ioutil.ReadFile(name)
+	buf, err := os.ReadFile(name)
 	if err == nil {
 		list := strings.Split(string(buf), "\n")
 		var ret []string
@@ -62,7 +63,7 @@ func loadNewTracker() {
 	}
 	resp, err := http.Get("https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best_ip.txt")
 	if err == nil {
-		buf, err := ioutil.ReadAll(resp.Body)
+		buf, err := io.ReadAll(resp.Body)
 		if err == nil {
 			arr := strings.Split(string(buf), "\n")
 			var ret []string

server/version/version.go

@@ -6,7 +6,7 @@ import (
 	// "github.com/anacrolix/torrent"
 )
 
-const Version = "MatriX.124.OE"
+const Version = "MatriX.125.OE"
 
 func GetTorrentVersion() string {
 	// _ = torrent.NewDefaultClientConfig()

server/web/auth/auth.go

@@ -3,8 +3,8 @@ package auth
 import (
 	"encoding/base64"
 	"encoding/json"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -28,7 +28,7 @@ func SetupAuth(engine *gin.Engine) *gin.RouterGroup {
 }
 
 func getAccounts() gin.Accounts {
-	buf, err := ioutil.ReadFile(filepath.Join(settings.Path, "accs.db"))
+	buf, err := os.ReadFile(filepath.Join(settings.Path, "accs.db"))
 	if err != nil {
 		return nil
 	}

server/web/blocker/blocker.go

@@ -4,9 +4,9 @@ import (
 	"bufio"
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"net"
 	"net/http"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -22,11 +22,11 @@ func Blocker() gin.HandlerFunc {
 	}
 
 	name := filepath.Join(settings.Path, "bip.txt")
-	buf, _ := ioutil.ReadFile(name)
+	buf, _ := os.ReadFile(name)
 	blackIpList := scanBuf(buf)
 
 	name = filepath.Join(settings.Path, "wip.txt")
-	buf, _ = ioutil.ReadFile(name)
+	buf, _ = os.ReadFile(name)
 	whiteIpList := scanBuf(buf)
 
 	if blackIpList.NumRanges() == 0 && whiteIpList.NumRanges() == 0 {

server/web/server.go

@@ -2,6 +2,7 @@ package web
 
 import (
 	"net"
+	"os"
 	"sort"
 
 	"server/rutor"
@@ -36,8 +37,8 @@ func Start(port string) {
 	}
 	err := BTS.Connect()
 	if err != nil {
-		waitChan <- err
-		return
+		log.TLogln("BTS.Connect() error!", err) // waitChan <- err
+		os.Exit(1)                              // return
 	}
 	rutor.Start()