From d84f2791a3d6be4b425e492620852943e4f81d1b Mon Sep 17 00:00:00 2001
From: zu1k <i@lgf.im>
Date: Mon, 7 Sep 2020 12:48:03 +0800
Subject: [PATCH] opti country find

---
 pkg/proxy/proxies.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkg/proxy/proxies.go b/pkg/proxy/proxies.go
index eaa45136..f89cc3ae 100644
--- a/pkg/proxy/proxies.go
+++ b/pkg/proxy/proxies.go
@@ -71,17 +71,21 @@ func (ps ProxyList) NameAddCounrty() ProxyList {
 		ii := i
 		go func() {
 			defer wg.Done()
-			ip, country, err := geoIp.Find(ps[ii].BaseInfo().Server)
-			if err != nil {
-				country = "🏁 ZZ"
-			}
-			ps[ii].SetName(fmt.Sprintf("%s", country))
-			ps[ii].SetCountry(country)
-
-			// trojan依赖域名？
-			if ps[ii].TypeName() != "trojan" {
-				ps[ii].SetIP(ip)
+			country := ps[ii].BaseInfo().Country
+			if country == "" {
+				ip, c, err := geoIp.Find(ps[ii].BaseInfo().Server)
+				if err != nil {
+					country = "🏁 ZZ"
+				} else {
+					country = c
+				}
+				ps[ii].SetCountry(country)
+				// trojan依赖域名？
+				if ps[ii].TypeName() != "trojan" {
+					ps[ii].SetIP(ip)
+				}
 			}
+			ps[ii].SetName(country)
 		}()
 	}
 	wg.Wait()