From 366d2d327af3f65a29fd2387702284c150742836 Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Wed, 12 Jan 2022 04:41:17 +0300
Subject: [PATCH] cosmetics

---
 server/settings/btsets.go                      |  6 +++---
 server/torr/btserver.go                        | 12 +++++++-----
 web/src/components/Settings/defaultSettings.js |  3 +--
 web/src/locales/en/translation.json            |  1 -
 web/src/locales/ru/translation.json            |  1 -
 web/src/locales/ua/translation.json            |  1 -
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/server/settings/btsets.go b/server/settings/btsets.go
index 3fe3357..3bc8393 100644
--- a/server/settings/btsets.go
+++ b/server/settings/btsets.go
@@ -12,7 +12,7 @@ import (
 
 type BTSets struct {
 	// Cache
-	CacheSize       int64 // in byte, def 96 MB
+	CacheSize       int64 // in byte, def 64 MB
 	ReaderReadAHead int   // in percent, 5%-100%, [...S__X__E...] [S-E] not clean
 	PreloadCache    int   // in percent
 
@@ -123,9 +123,9 @@ func SetDefault() {
 	sets.EnableDebug = false
 	sets.CacheSize = 64 * 1024 * 1024 // 64 MB
 	sets.PreloadCache = 50
-	sets.ConnectionsLimit = 23
+	sets.ConnectionsLimit = 25
 	sets.RetrackersMode = 1
 	sets.TorrentDisconnectTimeout = 30
-	sets.ReaderReadAHead = 95 // 95% preload
+	sets.ReaderReadAHead = 95 // 95%
 	BTsets = sets
 }
diff --git a/server/torr/btserver.go b/server/torr/btserver.go
index 991254d..4ff9fb5 100644
--- a/server/torr/btserver.go
+++ b/server/torr/btserver.go
@@ -12,6 +12,7 @@ import (
 	"server/settings"
 	"server/torr/storage/torrstor"
 	"server/torr/utils"
+	"server/version"
 )
 
 type BTServer struct {
@@ -59,12 +60,13 @@ func (bt *BTServer) configure() {
 	bt.storage = torrstor.NewStorage(settings.BTsets.CacheSize)
 	bt.config.DefaultStorage = bt.storage
 
-	userAgent := "qBittorrent/4.3.2"
-	peerID := "-qB4320-"
-	upnpID := "TorrServer"
-	cliVers := userAgent //"uTorrent/2210(25302)"
+	userAgent := "qBittorrent/4.3.9"
+	peerID := "-qB4390-"
+	upnpID := "TorrServer/" + version.Version
+	cliVers := userAgent
 
-//	bt.config.AlwaysWantConns = true
+	//	bt.config.AcceptPeerConnections = false
+	//	bt.config.AlwaysWantConns = true
 	bt.config.Debug = settings.BTsets.EnableDebug
 	bt.config.DisableIPv6 = settings.BTsets.EnableIPv6 == false
 	bt.config.DisableTCP = settings.BTsets.DisableTCP
diff --git a/web/src/components/Settings/defaultSettings.js b/web/src/components/Settings/defaultSettings.js
index 080af02..b0ffe4e 100644
--- a/web/src/components/Settings/defaultSettings.js
+++ b/web/src/components/Settings/defaultSettings.js
@@ -4,8 +4,7 @@ export default {
   UseDisk: false,
   UploadRateLimit: 0,
   TorrentsSavePath: '',
-  ConnectionsLimit: 23,
-  DhtConnectionLimit: 0,
+  ConnectionsLimit: 25,
   DisableDHT: false,
   DisablePEX: false,
   DisableTCP: false,
diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json
index f891006..775a6e4 100644
--- a/web/src/locales/en/translation.json
+++ b/web/src/locales/en/translation.json
@@ -96,7 +96,6 @@
     "ConnectionsLimit": "Connections Limit",
     "ConnectionsLimitHint": "20-25 recommended",
     "DHT": "DHT (Distributed Hash Table)",
-    "DhtConnectionLimit": "DHT Connection Limit",
     "Disk": "Disk",
     "DLNA": "DLNA Media Server",
     "DontAddRetrackers": "Don`t add retrackers",
diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json
index 8ee36bd..1e1002f 100644
--- a/web/src/locales/ru/translation.json
+++ b/web/src/locales/ru/translation.json
@@ -96,7 +96,6 @@
     "ConnectionsLimit": "Торрент-соединения",
     "ConnectionsLimitHint": "рекомендуется 20-25",
     "DHT": "DHT (Distributed Hash Table)",
-    "DhtConnectionLimit": "Лимит подключений DHT",
     "Disk": "ПЗУ / Накопитель",
     "DLNA": "DLNA-медиасервер",
     "DontAddRetrackers": "Ничего не делать",
diff --git a/web/src/locales/ua/translation.json b/web/src/locales/ua/translation.json
index 94ea8de..175dc77 100644
--- a/web/src/locales/ua/translation.json
+++ b/web/src/locales/ua/translation.json
@@ -96,7 +96,6 @@
     "ConnectionsLimit": "Обмеження з'єдань",
     "ConnectionsLimitHint": "рекомендовано 20-25",
     "DHT": "DHT (Distributed Hash Table)",
-    "DhtConnectionLimit": "Обмеження з'єдань DHT",
     "Disk": "ПЗП / Носій",
     "DLNA": "DLNA-медиасервер",
     "DontAddRetrackers": "Нічого не робити",