From 26e7956ef9aec0fa88956f42f0362d737e3af093 Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Thu, 22 Feb 2024 10:38:14 +0300
Subject: [PATCH] reformat peers info

---
 server/server.go                                             | 4 ++--
 server/torr/preload.go                                       | 4 ++--
 .../components/DialogTorrentDetailsContent/widgets/index.jsx | 2 +-
 web/src/locales/bg/translation.json                          | 2 +-
 web/src/locales/en/translation.json                          | 2 +-
 web/src/locales/ru/translation.json                          | 2 +-
 web/src/locales/ua/translation.json                          | 2 +-
 web/src/locales/zh/translation.json                          | 2 +-
 web/src/utils/Utils.js                                       | 5 +++--
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/server/server.go b/server/server.go
index 4fbaf26..1aece68 100644
--- a/server/server.go
+++ b/server/server.go
@@ -45,7 +45,7 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b
 			l.Close()
 		}
 		if err != nil {
-			log.TLogln("Port", sslport, "already in use! Please set different port for HTTPS. Abort")
+			log.TLogln("Port", sslport, "already in use! Please set different ssl port for HTTPS. Abort")
 			os.Exit(1)
 		}
 	}
@@ -59,7 +59,7 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b
 		l.Close()
 	}
 	if err != nil {
-		log.TLogln("Port", port, "already in use! Please set different sslport for HTTP. Abort")
+		log.TLogln("Port", port, "already in use! Please set different port for HTTP. Abort")
 		os.Exit(1)
 	}
 	// remove old disk caches
diff --git a/server/torr/preload.go b/server/torr/preload.go
index ac18d2b..1b83309 100644
--- a/server/torr/preload.go
+++ b/server/torr/preload.go
@@ -62,7 +62,7 @@ func (t *Torrent) Preload(index int, size int64) {
 		// Запуск лога в отдельном потоке
 		go func() {
 			for t.Stat == state.TorrentPreload {
-				stat := fmt.Sprint(file.Torrent().InfoHash().HexString(), " ", utils2.Format(float64(t.PreloadedBytes)), "/", utils2.Format(float64(t.PreloadSize)), " Speed:", utils2.Format(t.DownloadSpeed), " Peers:[", t.Torrent.Stats().ConnectedSeeders, "]", t.Torrent.Stats().ActivePeers, "/", t.Torrent.Stats().TotalPeers)
+				stat := fmt.Sprint(file.Torrent().InfoHash().HexString(), " ", utils2.Format(float64(t.PreloadedBytes)), "/", utils2.Format(float64(t.PreloadSize)), " Speed:", utils2.Format(t.DownloadSpeed), " Peers:", t.Torrent.Stats().ActivePeers, "/", t.Torrent.Stats().TotalPeers, " [Seeds:", t.Torrent.Stats().ConnectedSeeders, "]")
 				log.TLogln("Preload:", stat)
 				t.AddExpiredTime(time.Second * time.Duration(settings.BTsets.TorrentDisconnectTimeout))
 				time.Sleep(time.Second)
@@ -158,7 +158,7 @@ func (t *Torrent) Preload(index int, size int64) {
 
 		wg.Wait()
 	}
-	log.TLogln("End preload:", file.Torrent().InfoHash().HexString(), "Peers:[", t.Torrent.Stats().ConnectedSeeders, "]", t.Torrent.Stats().ActivePeers, "/", t.Torrent.Stats().TotalPeers)
+	log.TLogln("End preload:", file.Torrent().InfoHash().HexString(), "Peers:", t.Torrent.Stats().ActivePeers, "/", t.Torrent.Stats().TotalPeers, "[ Seeds:", t.Torrent.Stats().ConnectedSeeders, "]")
 }
 
 func (t *Torrent) findFileIndex(index int) *torrent.File {
diff --git a/web/src/components/DialogTorrentDetailsContent/widgets/index.jsx b/web/src/components/DialogTorrentDetailsContent/widgets/index.jsx
index cf567f3..a8592f1 100644
--- a/web/src/components/DialogTorrentDetailsContent/widgets/index.jsx
+++ b/web/src/components/DialogTorrentDetailsContent/widgets/index.jsx
@@ -51,7 +51,7 @@ export const PeersWidget = ({ data }) => {
   return (
     <StatisticsField
       title={t('Peers')}
-      value={getPeerString(data) || '0 · 0 / 0'}
+      value={getPeerString(data) || '0 / 0 · 0'}
       iconBg={iconBGColor}
       valueBg={valueBGColor}
       icon={SwapVerticalCircleIcon}
diff --git a/web/src/locales/bg/translation.json b/web/src/locales/bg/translation.json
index 177d460..ad276c8 100644
--- a/web/src/locales/bg/translation.json
+++ b/web/src/locales/bg/translation.json
@@ -72,7 +72,7 @@
     "Offline": "Извън линия",
     "OK": "OK",
     "OpenLink": "Отвори линк",
-    "Peers": "Пиъри",
+    "Peers": "Пиъри·Сийдъри",
     "PiecesCount": "Брой парчета",
     "PiecesLength": "Дължина на парчетата",
     "Playlist": "Плейлист",
diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json
index 9b53921..f2826e5 100644
--- a/web/src/locales/en/translation.json
+++ b/web/src/locales/en/translation.json
@@ -72,7 +72,7 @@
     "Offline": "Offline",
     "OK": "OK",
     "OpenLink": "Open link",
-    "Peers": "Peers",
+    "Peers": "Peers·Seeds",
     "PiecesCount": "Pieces count",
     "PiecesLength": "Pieces length",
     "Playlist": "Playlist",
diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json
index db4b2ef..456cd65 100644
--- a/web/src/locales/ru/translation.json
+++ b/web/src/locales/ru/translation.json
@@ -72,7 +72,7 @@
     "Offline": "Сервер недоступен",
     "OK": "OK",
     "OpenLink": "Открыть",
-    "Peers": "Пиры",
+    "Peers": "Пиры·Сиды",
     "PiecesCount": "Кол-во блоков",
     "PiecesLength": "Размер блока",
     "Playlist": "Плейлист",
diff --git a/web/src/locales/ua/translation.json b/web/src/locales/ua/translation.json
index b137ac4..85d63b6 100644
--- a/web/src/locales/ua/translation.json
+++ b/web/src/locales/ua/translation.json
@@ -72,7 +72,7 @@
     "Offline": "Сервер не доступний",
     "OK": "OK",
     "OpenLink": "Відкрити",
-    "Peers": "Піри",
+    "Peers": "Піри·Сіди",
     "PiecesCount": "К-сть блоків",
     "PiecesLength": "Розмір блоку",
     "Playlist": "Плейлист",
diff --git a/web/src/locales/zh/translation.json b/web/src/locales/zh/translation.json
index 1e2aeca..5d86d04 100644
--- a/web/src/locales/zh/translation.json
+++ b/web/src/locales/zh/translation.json
@@ -72,7 +72,7 @@
     "Offline": "离线",
     "OK": "确定",
     "OpenLink": "打开链接",
-    "Peers": "Peers",
+    "Peers": "Peers·Seeds",
     "PiecesCount": "块数量",
     "PiecesLength": "块长度",
     "Playlist": "播放列表",
diff --git a/web/src/utils/Utils.js b/web/src/utils/Utils.js
index 782a097..a54bfc6 100644
--- a/web/src/utils/Utils.js
+++ b/web/src/utils/Utils.js
@@ -20,8 +20,9 @@ export function humanizeSpeed(speed) {
 }
 
 export function getPeerString(torrent) {
-  if (!torrent || !torrent.connected_seeders) return null
-  return `${torrent.connected_seeders} · ${torrent.active_peers} / ${torrent.total_peers}`
+  if (!torrent || !torrent.active_peers) return null
+  const seeders = typeof torrent.connected_seeders !== 'undefined' ? torrent.connected_seeders : 0
+  return `${torrent.active_peers} / ${torrent.total_peers} · ${seeders}`
 }
 
 export const shortenText = (text, sympolAmount) =>