From bd223acd7304caa6c357a04b22f5922146877cef Mon Sep 17 00:00:00 2001 From: Whale Choi Date: Mon, 1 Apr 2024 19:43:49 +0800 Subject: [PATCH] updateGeodata remove sing-box type, always download v2ray type --- main/commands/update.go | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/main/commands/update.go b/main/commands/update.go index cf3b323..8965d6c 100644 --- a/main/commands/update.go +++ b/main/commands/update.go @@ -22,17 +22,15 @@ import ( ) const ( - tagUpdate = "update" - singboxUrl = "https://api.github.com/repos/SagerNet/sing-box/releases/latest" - mihomoUrl = "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" - yacdMetaDownloadUrl = "https://github.com/MetaCubeX/yacd/archive/gh-pages.zip" - xrayCoreDownloadUrl = "https://github.com/XTLS/Xray-core/releases/latest/download/Xray-android-arm64-v8a.zip" - v2rayCoreDownloadUrl = "https://github.com/v2fly/v2ray-core/releases/latest/download/v2ray-android-arm64-v8a.zip" - geoipDownloadUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" - geoipDownloadUrlSingbox = "https://github.com/lyc8503/sing-box-rules/releases/latest/download/geoip.db" - geositeDownloadUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" - geositeDownloadUrlSingbox = "https://github.com/lyc8503/sing-box-rules/releases/latest/download/geosite.db" - tun2socksDownloadUrl = "https://github.com/heiher/hev-socks5-tunnel/releases/latest/download/hev-socks5-tunnel-linux-arm64" + tagUpdate = "update" + singboxUrl = "https://api.github.com/repos/SagerNet/sing-box/releases/latest" + mihomoUrl = "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" + yacdMetaDownloadUrl = "https://github.com/MetaCubeX/yacd/archive/gh-pages.zip" + xrayCoreDownloadUrl = "https://github.com/XTLS/Xray-core/releases/latest/download/Xray-android-arm64-v8a.zip" + v2rayCoreDownloadUrl = "https://github.com/v2fly/v2ray-core/releases/latest/download/v2ray-android-arm64-v8a.zip" + geoipDownloadUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" + geositeDownloadUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" + tun2socksDownloadUrl = "https://github.com/heiher/hev-socks5-tunnel/releases/latest/download/hev-socks5-tunnel-linux-arm64" ) type UpdateCommand struct{} @@ -315,21 +313,11 @@ func updateGeodata() error { if err := os.MkdirAll(builds.Config.XrayHelper.DataDir, 0644); err != nil { return e.New("create DataDir failed, ", err).WithPrefix(tagUpdate) } - switch builds.Config.XrayHelper.CoreType { - case "sing-box": - if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geoip.db"), geoipDownloadUrlSingbox); err != nil { - return err - } - if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geosite.db"), geositeDownloadUrlSingbox); err != nil { - return err - } - default: - if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geoip.dat"), geoipDownloadUrl); err != nil { - return err - } - if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geosite.dat"), geositeDownloadUrl); err != nil { - return err - } + if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geoip.dat"), geoipDownloadUrl); err != nil { + return err + } + if err := common.DownloadFile(path.Join(builds.Config.XrayHelper.DataDir, "geosite.dat"), geositeDownloadUrl); err != nil { + return err } return nil }