Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-04-28 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: provider fallback should reparse proxies

Browse Source
This commit is contained in:
Dreamacro 2020-02-22 15:17:43 +08:00
parent 609869bf5a
commit 9eaca6e4ab
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adapters/provider/provider.go
View File

@ -114,10 +114,12 @@ func (pp *ProxySetProvider) Destroy() error {
func (pp *ProxySetProvider) Initial() error { func (pp *ProxySetProvider) Initial() error {
var buf []byte var buf []byte
var err error var err error
var isLocal bool
if stat, err := os.Stat(pp.vehicle.Path()); err == nil { if stat, err := os.Stat(pp.vehicle.Path()); err == nil {
buf, err = ioutil.ReadFile(pp.vehicle.Path()) buf, err = ioutil.ReadFile(pp.vehicle.Path())
modTime := stat.ModTime() modTime := stat.ModTime()
pp.updatedAt = &modTime pp.updatedAt = &modTime
isLocal = true
} else { } else {
buf, err = pp.vehicle.Read() buf, err = pp.vehicle.Read()
} }
@ -128,11 +130,20 @@ func (pp *ProxySetProvider) Initial() error {
proxies, err := pp.parse(buf) proxies, err := pp.parse(buf)
if err != nil { if err != nil {
if !isLocal {
return err
}
// parse local file error, fallback to remote // parse local file error, fallback to remote
buf, err = pp.vehicle.Read() buf, err = pp.vehicle.Read()
if err != nil { if err != nil {
return err return err
} }
proxies, err = pp.parse(buf)
if err != nil {
return err
}
} }
if err := ioutil.WriteFile(pp.vehicle.Path(), buf, fileMode); err != nil { if err := ioutil.WriteFile(pp.vehicle.Path(), buf, fileMode); err != nil {