Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 20:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update external-ui

Browse Source
This commit is contained in:
xishang0128 2023-09-20 14:23:58 +08:00
parent 20fafdca65
commit 8b518161a3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -608,6 +608,8 @@ func parseGeneral(cfg *RawConfig) (*General, error) {
return nil, err return nil, err
} }
} }
} else {
ExternalUIFolder = ExternalUIPath
} }
cfg.Tun.RedirectToTun = cfg.EBpf.RedirectToTun cfg.Tun.RedirectToTun = cfg.EBpf.RedirectToTun

22
config/update_ui.go
View File

@ -9,6 +9,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
C "github.com/Dreamacro/clash/constant"
) )
var ( var (
@ -24,29 +26,29 @@ func UpdateUI() error {
xdMutex.Lock() xdMutex.Lock()
defer xdMutex.Unlock() defer xdMutex.Unlock()
if ExternalUIPath == "" || ExternalUIFolder == "" || ExternalUIName == "" { if ExternalUIPath == "" || ExternalUIFolder == "" {
return fmt.Errorf("ExternalUI configure incomplete") return fmt.Errorf("ExternalUI configure incomplete")
} }
err := cleanup(ExternalUIFolder)
if err != nil {
if !os.IsNotExist(err) {
return fmt.Errorf("cleanup exist file error: %w", err)
}
}
data, err := downloadForBytes(ExternalUIURL) data, err := downloadForBytes(ExternalUIURL)
if err != nil { if err != nil {
return fmt.Errorf("can't download file: %w", err) return fmt.Errorf("can't download file: %w", err)
} }
saved := path.Join(ExternalUIPath, "download.zip") saved := path.Join(C.Path.HomeDir(), "download.zip")
if saveFile(data, saved) != nil { if saveFile(data, saved) != nil {
return fmt.Errorf("can't save zip file: %w", err) return fmt.Errorf("can't save zip file: %w", err)
} }
defer os.Remove(saved) defer os.Remove(saved)
unzipFolder, err := unzip(saved, ExternalUIPath) err = cleanup(ExternalUIFolder)
if err != nil {
if !os.IsNotExist(err) {
return fmt.Errorf("cleanup exist file error: %w", err)
}
}
unzipFolder, err := unzip(saved, C.Path.HomeDir())
if err != nil { if err != nil {
return fmt.Errorf("can't extract zip file: %w", err) return fmt.Errorf("can't extract zip file: %w", err)
} }