From 50c0860b9beffa64b3d616d34c8cc94827a9aff4 Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Wed, 25 May 2022 10:09:00 +0300
Subject: [PATCH] add DLNA server name and debug log options to web

---
 server/dlna/dlna.go                            |  5 +++++
 server/settings/btsets.go                      |  3 ++-
 .../Settings/SecondarySettingsComponent.jsx    | 18 ++++++++++++++++++
 web/src/components/Settings/SettingsDialog.jsx |  2 +-
 web/src/components/Settings/defaultSettings.js |  1 +
 web/src/locales/en/translation.json            |  3 +++
 web/src/locales/ru/translation.json            |  3 +++
 web/src/locales/ua/translation.json            |  3 +++
 8 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/server/dlna/dlna.go b/server/dlna/dlna.go
index 6c45aea..59a033e 100644
--- a/server/dlna/dlna.go
+++ b/server/dlna/dlna.go
@@ -140,6 +140,11 @@ func onBrowseMeta(path string, rootObjectPath string, host, userAgent string) (r
 
 func getDefaultFriendlyName() string {
 	logger := log.Default.WithNames("dlna")
+
+	if settings.BTsets.FriendlyName != "" {
+		return settings.BTsets.FriendlyName
+	}
+
 	ret := "TorrServer"
 	userName := ""
 	user, err := user.Current()
diff --git a/server/settings/btsets.go b/server/settings/btsets.go
index 68a6008..bad2116 100644
--- a/server/settings/btsets.go
+++ b/server/settings/btsets.go
@@ -28,7 +28,8 @@ type BTSets struct {
 	EnableDebug              bool // print logs
 
 	// DLNA
-	EnableDLNA bool
+	EnableDLNA   bool
+	FriendlyName string
 
 	// BT Config
 	EnableIPv6        bool
diff --git a/web/src/components/Settings/SecondarySettingsComponent.jsx b/web/src/components/Settings/SecondarySettingsComponent.jsx
index 8f977a7..56d2638 100644
--- a/web/src/components/Settings/SecondarySettingsComponent.jsx
+++ b/web/src/components/Settings/SecondarySettingsComponent.jsx
@@ -10,8 +10,10 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
   const {
     RetrackersMode,
     TorrentDisconnectTimeout,
+    EnableDebug,
     EnableDLNA,
     EnableIPv6,
+    FriendlyName,
     ForceEncrypt,
     DisableTCP,
     DisableUTP,
@@ -139,6 +141,22 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
         label={t('SettingsDialog.DLNA')}
         labelPlacement='start'
       />
+      <TextField
+        onChange={inputForm}
+        margin='normal'
+        id='FriendlyName'
+        label={t('SettingsDialog.FriendlyName')}
+        helperText={t('SettingsDialog.FriendlyNameHint')}
+        value={FriendlyName}
+        type='text'
+        variant='outlined'
+        fullWidth
+      />
+      <FormControlLabel
+        control={<Switch checked={EnableDebug} onChange={inputForm} id='EnableDebug' color='secondary' />}
+        label={t('SettingsDialog.EnableDebug')}
+        labelPlacement='start'
+      />
       <br />
       <InputLabel htmlFor='RetrackersMode'>{t('SettingsDialog.RetrackersMode')}</InputLabel>
       <Select
diff --git a/web/src/components/Settings/SettingsDialog.jsx b/web/src/components/Settings/SettingsDialog.jsx
index 11b1faf..56fe3cb 100644
--- a/web/src/components/Settings/SettingsDialog.jsx
+++ b/web/src/components/Settings/SettingsDialog.jsx
@@ -61,7 +61,7 @@ export default function SettingsDialog({ handleClose }) {
       )
         sets[id] = Boolean(!checked)
       else sets[id] = Boolean(checked)
-    } else if (type === 'url') {
+    } else if (type === 'url' || type === 'text') {
       sets[id] = value
     }
     setSettings(sets)
diff --git a/web/src/components/Settings/defaultSettings.js b/web/src/components/Settings/defaultSettings.js
index b0ffe4e..39865ae 100644
--- a/web/src/components/Settings/defaultSettings.js
+++ b/web/src/components/Settings/defaultSettings.js
@@ -14,6 +14,7 @@ export default {
   DownloadRateLimit: 0,
   EnableDebug: false,
   EnableIPv6: false,
+  FriendlyName: '',
   ForceEncrypt: false,
   PeersListenPort: 0,
   PreloadCache: 50,
diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json
index 775a6e4..2b005ba 100644
--- a/web/src/locales/en/translation.json
+++ b/web/src/locales/en/translation.json
@@ -100,7 +100,10 @@
     "DLNA": "DLNA Media Server",
     "DontAddRetrackers": "Don`t add retrackers",
     "DownloadRateLimit": "Download Rate Limit",
+    "EnableDebug": "Enable Debug Server Log",
     "ForceEncrypt": "Force Encrypt Headers",
+    "FriendlyName": "DLNA Server Name",
+    "FriendlyNameHint": "Leave blank to use default",
     "PeersListenPort": "Peers Listen Port",
     "PeersListenPortHint": "1024 - 65535, 0 - auto",
     "PreloadCache": "Preload Cache Before Play",
diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json
index 1e1002f..b7d27ec 100644
--- a/web/src/locales/ru/translation.json
+++ b/web/src/locales/ru/translation.json
@@ -100,7 +100,10 @@
     "DLNA": "DLNA-медиасервер",
     "DontAddRetrackers": "Ничего не делать",
     "DownloadRateLimit": "Ограничение скорости загрузки",
+    "EnableDebug": "Включить подробный журнал сервера",
     "ForceEncrypt": "Принудительное шифрование заголовков",
+    "FriendlyName": "Имя сервера DLNA",
+    "FriendlyNameHint": "Оставьте пустым, чтобы использовать значение по умолчанию.",
     "PeersListenPort": "Порт для входящих подключений",
     "PeersListenPortHint": "1024 - 65535, 0 - авто",
     "PreloadCache": "Буфер предзагрузки",
diff --git a/web/src/locales/ua/translation.json b/web/src/locales/ua/translation.json
index 175dc77..c5941ce 100644
--- a/web/src/locales/ua/translation.json
+++ b/web/src/locales/ua/translation.json
@@ -100,7 +100,10 @@
     "DLNA": "DLNA-медиасервер",
     "DontAddRetrackers": "Нічого не робити",
     "DownloadRateLimit": "Обмеження швидкості завантаження",
+    "EnableDebug": "Увімкнути журнал налагодження сервера",
     "ForceEncrypt": "Примусово шифрувати заголовки",
+    "FriendlyName": "Ім'я сервера DLNA",
+    "FriendlyNameHint": "Залиште порожнім, щоб використовувати значення за промовчанням.",
     "PeersListenPort": "Порт для вхідних з'єднань",
     "PeersListenPortHint": "1024 - 65535, 0 - авто",
     "PreloadCache": "Буфер попер. завантаження",