Fix proxy group selector

WindSpiritSR · Oct 4, 2020 · e07b915 · e07b915
1 parent 7a89da7
commit e07b915
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/model/string.go b/model/string.go
@@ -43,10 +43,7 @@ const (
 	PROMPT_MODEL_LABEL = "Select Proxy Mode"
 
 	PROMPT_PROXY_LABEL             = "Proxy Mode"
-	PROMPT_PROXY_ITEM_PROXY        = "Proxy"
-	PROMPT_PROXY_ITEM_DOMESTIC     = "Domestic"
-	PROMPT_PROXY_ITEM_GLOBAL       = "Global"
-	PROMPT_PROXY_ITEM_OTHERS       = "Others"
+	PROMPT_PROXY_ITEM_ALL          = "GLOBAL"
 	PROMPT_PROXY_ITEM_LATENCY_TEST = "Latency Test"
 
 	PROMPT_PROXY_GLOBAL_GROUPNAME = "GLOBAL"

diff --git a/step/switch_proxy.go b/step/switch_proxy.go
@@ -37,10 +37,16 @@ func (sp SwitchProxy) Run() error {
 			Name string
 		}
 
+		var proxyGroup []string
+		for name, group := range proxies.Proxies {
+			if group.Type.Is(C.Selector) && name != model.PROMPT_PROXY_ITEM_ALL {
+				proxyGroup = append(proxyGroup, name)
+			}
+		}
+
 		prompt := promptui.Select{
 			Label: model.PROMPT_PROXY_LABEL,
-			Items: []string{model.PROMPT_PROXY_ITEM_PROXY, model.PROMPT_PROXY_ITEM_DOMESTIC,
-				model.PROMPT_PROXY_ITEM_GLOBAL, model.PROMPT_PROXY_ITEM_OTHERS},
+			Items: proxyGroup,
 		}
 		_, proxyMode, err := prompt.Run()
 		if err != nil {