black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 10:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix download geo resources

Browse source
This commit is contained in:
世界 2023-07-19 21:01:06 +08:00
parent 98bf696d01
commit 8140af01aa
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
route/router_geo_resources.go
View file

@ -52,13 +52,15 @@ func (r *Router) prepareGeoIPDatabase() error {
geoPath = foundPath
}
}
geoPath = filemanager.BasePath(r.ctx, geoPath)
if rw.FileExists(geoPath) {
geoReader, codes, err := geoip.Open(geoPath)
if err == nil {
r.logger.Info("loaded geoip database: ", len(codes), " codes")
r.geoIPReader = geoReader
return nil
if !rw.FileExists(geoPath) {
geoPath = filemanager.BasePath(r.ctx, geoPath)
}
if stat, err := os.Stat(geoPath); err == nil {
if stat.IsDir() {
return E.New("geoip path is a directory: ", geoPath)
}
if stat.Size() == 0 {
os.Remove(geoPath)
}
}
if !rw.FileExists(geoPath) {
@ -96,7 +98,17 @@ func (r *Router) prepareGeositeDatabase() error {
geoPath = foundPath
}
}
geoPath = filemanager.BasePath(r.ctx, geoPath)
if !rw.FileExists(geoPath) {
geoPath = filemanager.BasePath(r.ctx, geoPath)
}
if stat, err := os.Stat(geoPath); err == nil {
if stat.IsDir() {
return E.New("geoip path is a directory: ", geoPath)
}
if stat.Size() == 0 {
os.Remove(geoPath)
}
}
if !rw.FileExists(geoPath) {
r.logger.Warn("geosite database not exists: ", geoPath)
var err error
@ -107,7 +119,6 @@ func (r *Router) prepareGeositeDatabase() error {
}
r.logger.Error("download geosite database: ", err)
os.Remove(geoPath)
// time.Sleep(10 * time.Second)
}
if err != nil {
return err