From 342e49a642acfb7cbe62bdf0603696e85ed277c1 Mon Sep 17 00:00:00 2001
From: zu1k <i@lgf.im>
Date: Wed, 22 Jul 2020 06:40:02 +0800
Subject: [PATCH] mod qqwry download

---
 pkg/qqwry/qqwry.go  |  7 +------
 pkg/qqwry/update.go | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkg/qqwry/qqwry.go b/pkg/qqwry/qqwry.go
index 17aa871..22994cb 100644
--- a/pkg/qqwry/qqwry.go
+++ b/pkg/qqwry/qqwry.go
@@ -25,18 +25,13 @@ func NewQQwry(filePath string) QQwry {
 	_, err := os.Stat(filePath)
 	if err != nil && os.IsNotExist(err) {
 		log.Println("文件不存在，尝试从网络获取最新纯真 IP 库")
-		fileData, err = Download()
+		fileData, err = Download(filePath)
 		if err != nil {
 			log.Printf("纯真IP库下载失败，请手动下载解压后保存到本地: %s \n", filePath)
 			log.Println("下载链接： https://qqwry.mirror.noc.one/qqwry.rar")
 			os.Exit(1)
-		} else {
-			if err := ioutil.WriteFile(filePath, fileData, 0644); err == nil {
-				log.Printf("已将最新的 纯真IP库 保存到本地: %s ", filePath)
-			}
 		}
 	} else {
-		// 打开文件句柄
 		fileInfo.FileBase, err = os.OpenFile(filePath, os.O_RDONLY, 0400)
 		if err != nil {
 			panic(err)
diff --git a/pkg/qqwry/update.go b/pkg/qqwry/update.go
index 74cd9dc..3b836ec 100644
--- a/pkg/qqwry/update.go
+++ b/pkg/qqwry/update.go
@@ -5,23 +5,38 @@ import (
 	"compress/zlib"
 	"encoding/binary"
 	"io/ioutil"
+	"log"
 	"net/http"
 )
 
-func Download() (data []byte, err error) {
+func Download(filePath string) (data []byte, err error) {
+	data, err = getData()
+	if err != nil {
+		log.Printf("纯真IP库下载失败，请手动下载解压后保存到本地: %s \n", filePath)
+		log.Println("下载链接： https://qqwry.mirror.noc.one/qqwry.rar")
+		return
+	}
+
+	if err = ioutil.WriteFile(filePath, data, 0644); err == nil {
+		log.Printf("已将最新的 纯真IP库 保存到本地: %s ", filePath)
+	}
+	return
+}
+
+func getData() (data []byte, err error) {
 	resp, err := http.Get("https://qqwry.mirror.noc.one/qqwry.rar")
 	if err != nil {
-		return nil, err
+		return
 	}
 	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return
 	}
 	key, err := getCopyWriteKey()
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	return unRar(body, key)