nite/sub2clash
1
Fork 0
mirror of https://github.com/nitezs/sub2clash.git synced 2025-04-03 20:23:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from timerzz/main

Browse Source 
fix 修复Get函数重试结束后，返回nil,nil的bug
This commit is contained in:
Nite07 2025-03-24 01:12:06 +11:00 committed by GitHub
commit db00433931
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/get.go
View File

@ -2,6 +2,7 @@ package common
import ( import (
"errors" "errors"
"fmt"
"net/http" "net/http"
"time" "time"
@ -28,10 +29,12 @@ func Get(url string, options ...GetOption) (resp *http.Response, err error) {
for _, option := range options { for _, option := range options {
option(&getConfig) option(&getConfig)
} }
var req *http.Request
var get *http.Response
for haveTried < retryTimes { for haveTried < retryTimes {
client := &http.Client{} client := &http.Client{}
//client.Timeout = time.Second * 10 //client.Timeout = time.Second * 10
req, err := http.NewRequest("GET", url, nil) req, err = http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
haveTried++ haveTried++
time.Sleep(retryDelay) time.Sleep(retryDelay)
@ -40,13 +43,12 @@ func Get(url string, options ...GetOption) (resp *http.Response, err error) {
if getConfig.userAgent != "" { if getConfig.userAgent != "" {
req.Header.Set("User-Agent", getConfig.userAgent) req.Header.Set("User-Agent", getConfig.userAgent)
} }
get, err := client.Do(req) get, err = client.Do(req)
if err != nil { if err != nil {
haveTried++ haveTried++
time.Sleep(retryDelay) time.Sleep(retryDelay)
continue continue
} else { } else {
if get != nil && get.ContentLength > config.Default.RequestMaxFileSize { if get != nil && get.ContentLength > config.Default.RequestMaxFileSize {
return nil, errors.New("文件过大") return nil, errors.New("文件过大")
} }
@ -54,5 +56,5 @@ func Get(url string, options ...GetOption) (resp *http.Response, err error) {
} }
} }
return nil, err return nil, fmt.Errorf("请求失败：%v", err)
} }