From 2e4000af79c65c1ab2c5e1e439313ef989daffc4 Mon Sep 17 00:00:00 2001 From: zu1k Date: Mon, 20 Jul 2020 19:42:26 +0800 Subject: [PATCH] add download fail catch --- pkg/cdn/cdn.go | 5 +++-- pkg/qqwry/qqwry.go | 3 ++- pkg/zxipv6wry/zxipv6wry.go | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/cdn/cdn.go b/pkg/cdn/cdn.go index 8704f14..55d9424 100644 --- a/pkg/cdn/cdn.go +++ b/pkg/cdn/cdn.go @@ -28,10 +28,11 @@ func NewCDN(filePath string) CDN { log.Println("文件不存在,尝试从网络获取最新CDN数据库") cdnData, err = Download() if err != nil { - panic(err) + log.Printf("CDN数据库下载失败,请手动下载解压后保存到本地: %s \n", filePath) + log.Println("下载链接: https://cdn.jsdelivr.net/gh/SukkaLab/cdn/dist/cdn.json") } else { if err := ioutil.WriteFile(filePath, cdnData, 0644); err == nil { - log.Printf("已将最新的 CDN数据库 保存到本地: %s ", filePath) + log.Printf("已将最新的 CDN数据库 保存到本地: %s \n", filePath) } } } else { diff --git a/pkg/qqwry/qqwry.go b/pkg/qqwry/qqwry.go index a2bb3d1..fd88ddb 100644 --- a/pkg/qqwry/qqwry.go +++ b/pkg/qqwry/qqwry.go @@ -28,7 +28,8 @@ func NewQQwry(filePath string) QQwry { log.Println("文件不存在,尝试从网络获取最新纯真 IP 库") fileData, err = Download() if err != nil { - panic(err) + log.Printf("纯真IP库下载失败,请手动下载解压后保存到本地: %s \n", filePath) + log.Println("下载链接: https://qqwry.mirror.noc.one/qqwry.rar") } else { if err := ioutil.WriteFile(filePath, fileData, 0644); err == nil { log.Printf("已将最新的 纯真IP库 保存到本地: %s ", filePath) diff --git a/pkg/zxipv6wry/zxipv6wry.go b/pkg/zxipv6wry/zxipv6wry.go index 73c0eff..441b3db 100644 --- a/pkg/zxipv6wry/zxipv6wry.go +++ b/pkg/zxipv6wry/zxipv6wry.go @@ -24,7 +24,8 @@ func NewZXwry(filePath string) ZXwry { // 判断文件是否存在 _, err := os.Stat(filePath) if err != nil && os.IsNotExist(err) { - log.Println("文件不存在,请自行下载 ZX IPV6库,并保存在", filePath) + log.Println("文件不存在,请自行下载 ZX IPV6库,解压并保存在", filePath) + log.Println("下载链接: https://www.zxinc.org/ip.7z") os.Exit(1) } else { // 打开文件句柄