feature: 部分渠道区分 resty.ErrAutoRedirectDisabled 错误，精细化控制错误返回

wujunwei928 · Apr 11, 2024 · 599ca00 · 599ca00
1 parent 95b9806
commit 599ca00
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/parser/douyin.go b/parser/douyin.go
@@ -88,11 +88,15 @@ func (d douYin) parseVideoID(videoId string) (*VideoParseInfo, error) {
 
 func (d douYin) parseShareUrl(shareUrl string) (*VideoParseInfo, error) {
 	client := resty.New()
+	// disable redirects in the HTTP client, get params before redirects
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
-	res, _ := client.R().
+	res, err := client.R().
 		SetHeader(HttpHeaderUserAgent, DefaultUserAgent).
 		Get(shareUrl)
-	// 这里会返回err, auto redirect is disabled
+	// 非 resty.ErrAutoRedirectDisabled 错误时，返回错误
+	if !errors.Is(err, resty.ErrAutoRedirectDisabled) {
+		return nil, err
+	}
 
 	locationRes, err := res.RawResponse.Location()
 	if err != nil {

diff --git a/parser/huoshan.go b/parser/huoshan.go
@@ -35,11 +35,15 @@ func (h huoShan) parseVideoID(videoId string) (*VideoParseInfo, error) {
 
 func (h huoShan) parseShareUrl(shareUrl string) (*VideoParseInfo, error) {
 	client := resty.New()
+	// disable redirects in the HTTP client, get params before redirects
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
-	res, _ := client.R().
+	res, err := client.R().
 		SetHeader(HttpHeaderUserAgent, DefaultUserAgent).
 		Get(shareUrl)
-	// 这里会返回err, auto redirect is disabled
+	// 非 resty.ErrAutoRedirectDisabled 错误时，返回错误
+	if !errors.Is(err, resty.ErrAutoRedirectDisabled) {
+		return nil, err
+	}
 
 	locationRes, err := res.RawResponse.Location()
 	if err != nil {

diff --git a/parser/kuaishou.go b/parser/kuaishou.go
@@ -14,12 +14,16 @@ type kuaiShou struct{}
 
 func (k kuaiShou) parseShareUrl(shareUrl string) (*VideoParseInfo, error) {
 	client := resty.New()
+	// disable redirects in the HTTP client, get params before redirects
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
-	res, _ := client.R().
+	res, err := client.R().
 		SetHeader(HttpHeaderUserAgent, DefaultUserAgent).
 		SetHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7").
 		Get(shareUrl)
-	//这里会返回err, auto redirect is disabled
+	// 非 resty.ErrAutoRedirectDisabled 错误时，返回错误
+	if !errors.Is(err, resty.ErrAutoRedirectDisabled) {
+		return nil, err
+	}
 
 	// 获取 cookies： did，didv
 	cookies := res.RawResponse.Cookies()

diff --git a/parser/pipixia.go b/parser/pipixia.go
@@ -42,11 +42,15 @@ func (p piPiXia) parseVideoID(videoId string) (*VideoParseInfo, error) {
 
 func (p piPiXia) parseShareUrl(shareUrl string) (*VideoParseInfo, error) {
 	client := resty.New()
+	// disable redirects in the HTTP client, get params before redirects
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
-	res, _ := client.R().
+	res, err := client.R().
 		SetHeader(HttpHeaderUserAgent, DefaultUserAgent).
 		Get(shareUrl)
-	// 这里会返回err, auto redirect is disabled
+	// 非 resty.ErrAutoRedirectDisabled 错误时，返回错误
+	if !errors.Is(err, resty.ErrAutoRedirectDisabled) {
+		return nil, err
+	}
 
 	locationRes, err := res.RawResponse.Location()
 	if err != nil {

diff --git a/parser/xigua.go b/parser/xigua.go
@@ -18,11 +18,15 @@ type xiGua struct {
 
 func (x xiGua) parseShareUrl(shareUrl string) (*VideoParseInfo, error) {
 	client := resty.New()
+	// disable redirects in the HTTP client, get params before redirects
 	client.SetRedirectPolicy(resty.NoRedirectPolicy())
-	res, _ := client.R().
+	res, err := client.R().
 		SetHeader(HttpHeaderUserAgent, DefaultUserAgent).
 		Get(shareUrl)
-	// 这里会返回err, auto redirect is disabled
+	// 非 resty.ErrAutoRedirectDisabled 错误时，返回错误
+	if !errors.Is(err, resty.ErrAutoRedirectDisabled) {
+		return nil, err
+	}
 
 	locationRes, err := res.RawResponse.Location()
 	if err != nil {