init 1.2.x

src/server/utils/BlockedIP.go

@@ -1,35 +0,0 @@
-package utils
-
-import (
-	"bufio"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-
-	"server/settings"
-
-	"github.com/anacrolix/torrent/iplist"
-)
-
-func ReadBlockedIP() (ranger iplist.Ranger, err error) {
-	buf, err := ioutil.ReadFile(filepath.Join(settings.Path, "blocklist"))
-	if err != nil {
-		return nil, err
-	}
-	scanner := bufio.NewScanner(strings.NewReader(string(buf)))
-	var ranges []iplist.Range
-	for scanner.Scan() {
-		r, ok, err := iplist.ParseBlocklistP2PLine(scanner.Bytes())
-		if err != nil {
-			return nil, err
-		}
-		if ok {
-			ranges = append(ranges, r)
-		}
-	}
-	err = scanner.Err()
-	if len(ranges) > 0 {
-		ranger = iplist.New(ranges)
-	}
-	return
-}

src/server/utils/Torrent.go

@@ -1,132 +0,0 @@
-package utils
-
-import (
-	"encoding/base32"
-	"errors"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"strings"
-	"time"
-
-	"server/settings"
-
-	"github.com/anacrolix/torrent"
-	"golang.org/x/time/rate"
-)
-
-var defTrackers = []string{
-	"http://retracker.local",
-
-	"http://bt4.t-ru.org/ann?magnet",
-	"http://retracker.mgts.by:80/announce",
-	"http://tracker.city9x.com:2710/announce",
-	"http://tracker.electro-torrent.pl:80/announce",
-	"http://tracker.internetwarriors.net:1337/announce",
-	"http://tracker2.itzmx.com:6961/announce",
-	"udp4://46.148.18.250:2710",
-	"udp://opentor.org:2710",
-	"udp://public.popcorn-tracker.org:6969/announce",
-	"udp://tracker.opentrackr.org:1337/announce",
-
-	"http://bt.svao-ix.ru/announce",
-
-	"udp://explodie.org:6969/announce",
-
-	//https://github.com/ngosang/trackerslist/blob/master/trackers_best_ip.txt 18.12.2019
-	"udp4://62.138.0.158:6969/announce",
-	"udp4://188.241.58.209:6969/announce",
-	"udp4://93.158.213.92:1337/announce",
-	"udp4://62.210.97.59:1337/announce",
-	"udp4://151.80.120.113:2710/announce",
-	"udp4://151.80.120.115:2710/announce",
-	"udp4://165.231.0.116:80/announce",
-	"udp4://208.83.20.20:6969/announce",
-	"udp4://5.206.54.49:6969/announce",
-	"udp4://35.156.19.129:6969/announce",
-	"udp4://37.235.174.46:2710/announce",
-	"udp4://185.181.60.67:80/announce",
-	"udp4://54.37.235.149:6969/announce",
-	"udp4://89.234.156.205:451/announce",
-	"udp4://159.100.245.181:6969/announce",
-	"udp4://142.44.243.4:1337/announce",
-	"udp4://51.15.40.114:80/announce",
-	"udp4://176.113.71.19:6961/announce",
-	"udp4://212.47.227.58:6969/announce",
-}
-
-var loadedTrackers []string
-
-func GetDefTrackers() []string {
-	loadNewTracker()
-	if len(loadedTrackers) == 0 {
-		return defTrackers
-	}
-	return loadedTrackers
-}
-
-func loadNewTracker() {
-	if len(loadedTrackers) > 0 {
-		return
-	}
-	resp, err := http.Get("https://newtrackon.com/api/stable")
-	if err == nil {
-		buf, err := ioutil.ReadAll(resp.Body)
-		if err == nil {
-			arr := strings.Split(string(buf), "\n")
-			var ret []string
-			for _, s := range arr {
-				s = strings.TrimSpace(s)
-				if len(s) > 0 {
-					ret = append(ret, s)
-				}
-			}
-			loadedTrackers = ret
-		}
-	}
-}
-
-func PeerIDRandom(peer string) string {
-	randomBytes := make([]byte, 32)
-	_, err := rand.Read(randomBytes)
-	if err != nil {
-		panic(err)
-	}
-	return peer + base32.StdEncoding.EncodeToString(randomBytes)[:20-len(peer)]
-}
-
-func GotInfo(t *torrent.Torrent, timeout int) error {
-	gi := t.GotInfo()
-	select {
-	case <-gi:
-		return nil
-	case <-time.Tick(time.Second * time.Duration(timeout)):
-		return errors.New("timeout load torrent info")
-	}
-}
-
-func GetReadahead() int64 {
-	readahead := settings.Get().CacheSize - (138412032) //132mb
-	if readahead < 69206016 {                           //66mb
-		readahead = int64(float64(settings.Get().CacheSize) * 0.33)
-		if readahead < 66*1024*1024 {
-			readahead = int64(settings.Get().CacheSize)
-			if readahead > 66*1024*1024 {
-				readahead = 66 * 1024 * 1024
-			}
-		}
-	}
-	return readahead
-}
-
-func Limit(i int) *rate.Limiter {
-	l := rate.NewLimiter(rate.Inf, 0)
-	if i > 0 {
-		b := i
-		if b < 16*1024 {
-			b = 16 * 1024
-		}
-		l = rate.NewLimiter(rate.Limit(i), b)
-	}
-	return l
-}

src/server/utils/strings.go

@@ -3,8 +3,6 @@ package utils
 import (
 	"fmt"
 	"regexp"
-	"runtime"
-	"runtime/debug"
 	"strconv"
 	"strings"
 )
@@ -18,15 +16,6 @@ func CleanFName(file string) string {
 	return ret
 }
 
-func FreeOSMem() {
-	debug.FreeOSMemory()
-}
-
-func FreeOSMemGC() {
-	runtime.GC()
-	debug.FreeOSMemory()
-}
-
 const (
 	_ = 1.0 << (10 * iota) // ignore first value by assigning to blank identifier
 	KB
@@ -68,13 +57,3 @@ func Format(b float64) string {
 
 	return fmt.Sprintf("%.2f%s", value, multiple)
 }
-
-//
-//func IsCyrillic(str string) bool {
-//	for _, r := range str {
-//		if unicode.Is(unicode.Cyrillic, r) {
-//			return true
-//		}
-//	}
-//	return false
-//}