S-VPN/server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(proxy): update group selection logic to skip empty and default names

Browse Source
This commit is contained in:
Chang lue Tsen 2025-07-16 14:27:16 -04:00 committed by Leif Draven
parent 8c4c7d0773
commit 82e447c55e
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/adapter/uilts.go
View File

@ -245,7 +245,7 @@ func FindDefaultGroup(groups []*server.RuleGroup) string {
return group.Name
}
}
return "智能线路"
return AutoSelect
}
// SortGroups sorts the provided slice of proxy groups by their names.
@ -254,6 +254,9 @@ func SortGroups(groups []proxy.Group, defaultName string) []proxy.Group {
var selectedGroup proxy.Group
// 在所有分组找到默认分组并将他放到第一个
for _, group := range groups {
if group.Name == "" || group.Name == "DIRECT" || group.Name == "REJECT" {
continue
}
if group.Name == defaultName {
group.Proxies = tool.RemoveStringElement(group.Proxies, defaultName, "REJECT")
sortedGroups = append([]proxy.Group{group}, sortedGroups...)
@ -276,17 +279,3 @@ func SortGroups(groups []proxy.Group, defaultName string) []proxy.Group {
return sortedGroups
}
// RemoveElementByName removes elements from the slice of proxy groups by their names.
func RemoveElementByName(groups []proxy.Group, names ...string) []proxy.Group {
for i := 0; i < len(groups); i++ {
for _, name := range names {
if groups[i].Name == name {
groups = append(groups[:i], groups[i+1:]...)
i-- // Adjust index after removal
break // Exit inner loop to avoid index out of range
}
}
}
return groups
}