From 6dea0adb19be7ecf4fd3edfbcc9e8288bcc7fb30 Mon Sep 17 00:00:00 2001
From: Haruue Icymoon <i@haruue.moe>
Date: Wed, 21 Feb 2024 17:22:45 +0800
Subject: [PATCH] feat: re-download geo db when autoDL && load fail

---
 app/internal/utils/geoloader.go | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/internal/utils/geoloader.go b/app/internal/utils/geoloader.go
index 051773124c..328be68a44 100644
--- a/app/internal/utils/geoloader.go
+++ b/app/internal/utils/geoloader.go
@@ -43,6 +43,10 @@ func (l *GeoLoader) shouldDownload(filename string) bool {
 	if os.IsNotExist(err) {
 		return true
 	}
+	if info.Size() == 0 {
+		// empty files are loadable by v2geo, but we consider it broken
+		return true
+	}
 	dt := time.Now().Sub(info.ModTime())
 	if l.UpdateInterval == 0 {
 		return dt > geoDefaultUpdateInterval
@@ -101,7 +105,15 @@ func (l *GeoLoader) LoadGeoIP() (map[string]*v2geo.GeoIP, error) {
 		autoDL = true
 		filename = geoipFilename
 	}
-	if autoDL && l.shouldDownload(filename) {
+	if autoDL {
+		if !l.shouldDownload(filename) {
+			m, err := v2geo.LoadGeoIP(filename)
+			if err == nil {
+				l.geoipMap = m
+				return m, nil
+			}
+			// file is broken, download it again
+		}
 		err := l.downloadAndCheck(filename, geoipURL, func(filename string) error {
 			_, err := v2geo.LoadGeoIP(filename)
 			return err
@@ -128,7 +140,15 @@ func (l *GeoLoader) LoadGeoSite() (map[string]*v2geo.GeoSite, error) {
 		autoDL = true
 		filename = geositeFilename
 	}
-	if autoDL && l.shouldDownload(filename) {
+	if autoDL {
+		if !l.shouldDownload(filename) {
+			m, err := v2geo.LoadGeoSite(filename)
+			if err == nil {
+				l.geositeMap = m
+				return m, nil
+			}
+			// file is broken, download it again
+		}
 		err := l.downloadAndCheck(filename, geositeURL, func(filename string) error {
 			_, err := v2geo.LoadGeoSite(filename)
 			return err