From ccfd1edb8ceabce177aa44f66b73d694ea87c790 Mon Sep 17 00:00:00 2001 From: scientificworld Date: Fri, 30 Jun 2023 19:37:28 +0800 Subject: [PATCH] feat!: find default IP segment file at the location of the executable --- main.go | 2 +- task/ip.go | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index aa450a3..94c6352 100644 --- a/main.go +++ b/main.go @@ -92,7 +92,7 @@ https://github.com/XIU2/CloudflareSpeedTest flag.Float64Var(&task.MinSpeed, "sl", 0, "下载速度下限") flag.IntVar(&utils.PrintNum, "p", 10, "显示结果数量") - flag.StringVar(&task.IPFile, "f", "ip.txt", "IP段数据文件") + flag.StringVar(&task.IPFile, "f", "", "IP段数据文件") flag.StringVar(&task.IPText, "ip", "", "指定IP段数据") flag.StringVar(&utils.Output, "o", "result.csv", "输出结果文件") diff --git a/task/ip.go b/task/ip.go index 48f2715..ab7b032 100644 --- a/task/ip.go +++ b/task/ip.go @@ -9,15 +9,21 @@ import ( "strconv" "strings" "time" + "path/filepath" ) -const defaultInputFile = "ip.txt" +func getDefaultInputFile() string { + exe, _ := os.Executable() + sym, _ := filepath.EvalSymlinks(exe) + log.Print(sym) + return filepath.Dir(sym) + "/ip.txt" +} var ( // TestAll test all ip TestAll = false // IPFile is the filename of IP Rangs - IPFile = defaultInputFile + IPFile = getDefaultInputFile() IPText string ) @@ -165,7 +171,7 @@ func loadIPRanges() []*net.IPAddr { } } else { // 从文件中获取 IP 段数据 if IPFile == "" { - IPFile = defaultInputFile + IPFile = getDefaultInputFile() } file, err := os.Open(IPFile) if err != nil {