elmgates/res-downloader
1
0
Fork 0
mirror of https://github.com/putyy/res-downloader.git synced 2026-01-12 06:04:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改doc、优化Mac设置代理等

Browse Source
This commit is contained in:
putyy
2025-02-11 21:40:29 +08:00
parent 69f8224453
commit 8ed7e144e1
10 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/app.go
View File

@@ -175,7 +175,7 @@ func (a *App) OpenSystemProxy() bool {
a.IsProxy = true
return true
}
DialogErr("设置失败" + err.Error())
DialogErr("设置失败:" + err.Error())
return false
}
@@ -188,7 +188,7 @@ func (a *App) UnsetSystemProxy() bool {
a.IsProxy = false
return true
}
DialogErr("设置失败")
DialogErr("设置失败:" + err.Error())
return false
}

35
core/system_darwin.go
View File

@@ -18,15 +18,32 @@ func (s *SystemSetup) getNetworkServices() ([]string, error) {
services := strings.Split(string(output), "\n")
var validServices []string
var activeServices []string
for _, service := range services {
service = strings.TrimSpace(service)
if service != "" && !strings.Contains(service, "*") && !strings.Contains(service, "Serial Port") {
validServices = append(validServices, service)
if service == "" || strings.Contains(service, "*") || strings.Contains(service, "Serial Port") {
continue
}
// 检查服务是否活动
infoCmd := exec.Command("networksetup", "-getinfo", service)
infoOutput, err := infoCmd.Output()
if err != nil {
fmt.Printf("failed to get info for service %s: %v\n", service, err)
continue
}
// 如果输出中包含 "IP address:"，说明服务是活动的
if strings.Contains(string(infoOutput), "IP address:") {
activeServices = append(activeServices, service)
}
}
return validServices, nil
if len(activeServices) == 0 {
return nil, fmt.Errorf("no active network services found")
}
return activeServices, nil
}
func (s *SystemSetup) setProxy() error {
@@ -34,9 +51,6 @@ func (s *SystemSetup) setProxy() error {
if err != nil {
return err
}
if len(services) == 0 {
return fmt.Errorf("find to Network failed")
}
is := false
for _, serviceName := range services {
@@ -56,7 +70,7 @@ func (s *SystemSetup) setProxy() error {
return nil
}
return fmt.Errorf("find to Network failed")
return fmt.Errorf("failed to set proxy for any active network service")
}
func (s *SystemSetup) unsetProxy() error {
@@ -64,9 +78,6 @@ func (s *SystemSetup) unsetProxy() error {
if err != nil {
return err
}
if len(services) == 0 {
return fmt.Errorf("find to Network failed")
}
is := false
for _, serviceName := range services {
@@ -86,7 +97,7 @@ func (s *SystemSetup) unsetProxy() error {
return nil
}
return fmt.Errorf("find to Network failed")
return fmt.Errorf("failed to set proxy for any active network service")
}
func (s *SystemSetup) installCert() (string, error) {