Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 14:20:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

replace strings.Split with SplitSeq

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2025-05-31 19:03:41 +02:00
parent 60af36813b
commit b6873768b2
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/acme/acme.go
View File

@@ -767,7 +767,7 @@ func (c *Configuration) renewCertificates() error {
func isDomainValid(domain string) (string, bool) { func isDomainValid(domain string) (string, bool) {
isValid := false isValid := false
for _, d := range strings.Split(domain, ",") { for d := range strings.SplitSeq(domain, ",") {
d = strings.TrimSpace(d) d = strings.TrimSpace(d)
if d != "" { if d != "" {
isValid = true isValid = true
@@ -785,7 +785,7 @@ func getDomains(domain string) []string {
delimiter = " " delimiter = " "
} }
for _, d := range strings.Split(domain, delimiter) { for d := range strings.SplitSeq(domain, delimiter) {
d = strings.TrimSpace(d) d = strings.TrimSpace(d)
if d != "" { if d != "" {
domains = append(domains, d) domains = append(domains, d)

2
internal/cmd/portable.go
View File

@@ -496,7 +496,7 @@ func getPatternsFilterValues(value string) (string, []string) {
if len(dirExts) > 1 { if len(dirExts) > 1 {
dir := strings.TrimSpace(dirExts[0]) dir := strings.TrimSpace(dirExts[0])
exts := []string{} exts := []string{}
for _, e := range strings.Split(dirExts[1], ",") { for e := range strings.SplitSeq(dirExts[1], ",") {
cleanedExt := strings.TrimSpace(e) cleanedExt := strings.TrimSpace(e)
if cleanedExt != "" { if cleanedExt != "" {
exts = append(exts, cleanedExt) exts = append(exts, cleanedExt)

2
internal/config/config.go
View File

@@ -2278,7 +2278,7 @@ func lookupStringListFromEnv(envName string) ([]string, bool) {
value, ok := os.LookupEnv(envName) value, ok := os.LookupEnv(envName)
if ok { if ok {
var result []string var result []string
for _, v := range strings.Split(value, ",") { for v := range strings.SplitSeq(value, ",") {
val := strings.TrimSpace(v) val := strings.TrimSpace(v)
if val != "" { if val != "" {
result = append(result, val) result = append(result, val)

2
internal/dataprovider/pgsql.go
View File

@@ -281,7 +281,7 @@ func getPGSQLHostsAndPorts(configHost string, configPort int) (string, string) {
defaultPort = "5432" defaultPort = "5432"
} }
for _, hostport := range strings.Split(configHost, ",") { for hostport := range strings.SplitSeq(configHost, ",") {
hostport = strings.TrimSpace(hostport) hostport = strings.TrimSpace(hostport)
if hostport == "" { if hostport == "" {
continue continue

2
internal/httpd/api_utils.go
View File

@@ -161,7 +161,7 @@ func getURLPath(r *http.Request) string {
func getCommaSeparatedQueryParam(r *http.Request, key string) []string { func getCommaSeparatedQueryParam(r *http.Request, key string) []string {
var result []string var result []string
for _, val := range strings.Split(r.URL.Query().Get(key), ",") { for val := range strings.SplitSeq(r.URL.Query().Get(key), ",") {
val = strings.TrimSpace(val) val = strings.TrimSpace(val)
if val != "" { if val != "" {
result = append(result, val) result = append(result, val)

2
internal/httpd/web.go
View File

@@ -107,7 +107,7 @@ type resetPwdPage struct {
func getSliceFromDelimitedValues(values, delimiter string) []string { func getSliceFromDelimitedValues(values, delimiter string) []string {
result := []string{} result := []string{}
for _, v := range strings.Split(values, delimiter) { for v := range strings.SplitSeq(values, delimiter) {
cleaned := strings.TrimSpace(v) cleaned := strings.TrimSpace(v)
if cleaned != "" { if cleaned != "" {
result = append(result, cleaned) result = append(result, cleaned)

2
internal/util/util.go
View File

@@ -731,7 +731,7 @@ func GetRealIP(r *http.Request, header string, depth int) string {
var ipAddresses []string var ipAddresses []string
for _, h := range r.Header.Values(header) { for _, h := range r.Header.Values(header) {
for _, ipStr := range strings.Split(h, ",") { for ipStr := range strings.SplitSeq(h, ",") {
ipStr = strings.TrimSpace(ipStr) ipStr = strings.TrimSpace(ipStr)
ipAddresses = append(ipAddresses, ipStr) ipAddresses = append(ipAddresses, ipStr)
} }