admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(settings): use qdm12/gosettings functions

Browse Source 
- use: FileExists, ObfuscateKey, BoolToYesNo
- remove local functions moved to gosettings
This commit is contained in:
Quentin McGaw
2023-05-28 10:33:36 +00:00
parent 22b2e2cc6e
commit def407d610
15 changed files with 26 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/configuration/settings/shadowsocks.go
View File

@@ -1,7 +1,6 @@
package settings
import (
"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
"github.com/qdm12/gosettings"
"github.com/qdm12/gotree"
"github.com/qdm12/ss-server/pkg/tcpudp"
@@ -54,7 +53,7 @@ func (s Shadowsocks) String() string {
func (s Shadowsocks) toLinesNode() (node *gotree.Node) {
node = gotree.New("Shadowsocks server settings:")
node.Appendf("Enabled: %s", helpers.BoolPtrToYesNo(s.Enabled))
node.Appendf("Enabled: %s", gosettings.BoolToYesNo(s.Enabled))
if !*s.Enabled {
return node
}
@@ -62,8 +61,8 @@ func (s Shadowsocks) toLinesNode() (node *gotree.Node) {
// TODO have ToLinesNode in qdm12/ss-server
node.Appendf("Listening address: %s", s.Address)
node.Appendf("Cipher: %s", s.CipherName)
node.Appendf("Password: %s", helpers.ObfuscatePassword(*s.Password))
node.Appendf("Log addresses: %s", helpers.BoolPtrToYesNo(s.LogAddresses))
node.Appendf("Password: %s", gosettings.ObfuscateKey(*s.Password))
node.Appendf("Log addresses: %s", gosettings.BoolToYesNo(s.LogAddresses))
return node
}