fix: add more linters and address problems

iawia002 · Feb 2, 2023 · 4ccdd13 · 4ccdd13
1 parent 32f3462
commit 4ccdd13
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 10 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -10,10 +10,22 @@ linter-settings:
 
 linters:
   enable:
+    - bodyclose
+    - errcheck
     - goconst
+    - gofmt
     - goimports
+    - gosimple
+    - govet
+    - ineffassign
     - misspell
+    - nilerr
+    - staticcheck
+    - typecheck
+    - unconvert
     - unparam
+    - unused
+    - whitespace
 
 issues:
   exclude-use-default: false

diff --git a/downloader/downloader.go b/downloader/downloader.go
@@ -69,7 +69,6 @@ func New(option Options) *Downloader {
 
 // caption downloads danmaku, subtitles, etc
 func (downloader *Downloader) caption(url, fileName, ext string, transform func([]byte) ([]byte, error)) error {
-
 	refer := downloader.option.Refer
 	if refer == "" {
 		refer = url
@@ -358,7 +357,6 @@ func (downloader *Downloader) multiThreadSave(dataPart *extractors.Part, refer,
 			} else {
 				chunkSize = int64(downloader.option.ChunkSizeMB) * 1024 * 1024
 			}
-			end = computeEnd(part.Cur, chunkSize, part.End)
 			remainingSize := part.End - part.Cur + 1
 			if part.Cur == part.Start {
 				// Only write part to new file.

diff --git a/extractors/bilibili/bilibili.go b/extractors/bilibili/bilibili.go
@@ -477,7 +477,6 @@ func getSubTitleCaptionPart(aid int, cid int) *extractors.CaptionPart {
 		},
 		Transform: subtitleTransform,
 	}
-
 }
 
 func subtitleTransform(body []byte) ([]byte, error) {

diff --git a/extractors/douyin/douyin.go b/extractors/douyin/douyin.go
@@ -41,6 +41,7 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
+		defer resp.Body.Close() // nolint
 		url = resp.Header.Get("location")
 	}
 

diff --git a/extractors/geekbang/geekbang.go b/extractors/geekbang/geekbang.go
@@ -114,7 +114,7 @@ func (e *extractor) Extract(url string, _ extractors.Options) ([]*extractors.Dat
 	}
 
 	// Get video license token information
-	params = strings.NewReader("{\"source_type\":1,\"aid\":" + string(matches[2]) + ",\"video_id\":\"" + string(data.Data.VideoID) + "\"}")
+	params = strings.NewReader("{\"source_type\":1,\"aid\":" + matches[2] + ",\"video_id\":\"" + data.Data.VideoID + "\"}")
 	res, err = request.Request(http.MethodPost, "https://time.geekbang.org/serv/v3/source_auth/video_play_auth", params, heanders)
 	if err != nil {
 		return nil, errors.WithStack(err)

diff --git a/extractors/ixigua/ixigua.go b/extractors/ixigua/ixigua.go
@@ -61,7 +61,7 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 		if err != nil {
 			return nil, errors.WithStack(err)
 		}
-
+		defer resp.Body.Close() // nolint
 		// follow redirects, https://stackoverflow.com/a/16785343
 		finalURL = resp.Request.URL.String()
 	}
@@ -86,7 +86,6 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 	query, err := gojq.Parse("{title: .data.title} + {qualities: [.data.videoResource.normal.video_list | .[] | {url: .main_url, size: .size, ext: .vtype, quality: .definition}]}")
 	if err != nil {
 		return nil, errors.WithStack(err)
-
 	}
 
 	video := Video{}
@@ -135,7 +134,6 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 			URL:     url,
 		},
 	}, nil
-
 }
 
 func base64Decode(t string) string {

diff --git a/extractors/weibo/weibo.go b/extractors/weibo/weibo.go
@@ -44,7 +44,6 @@ func getXSRFToken() (string, error) {
 	}
 	url := "https://weibo.com/ajax/getversion"
 	req, err := http.NewRequest(http.MethodHead, url, nil)
-
 	if err != nil {
 		return "", err
 	}
@@ -54,6 +53,8 @@ func getXSRFToken() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer res.Body.Close() // nolint
+
 	token := utils.MatchOneOf(res.Header.Get("Set-Cookie"), `XSRF-TOKEN=(.+?);`)[1]
 	return token, nil
 }

diff --git a/extractors/xinpianchang/xinpianchang.go b/extractors/xinpianchang/xinpianchang.go
@@ -113,5 +113,4 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 			URL:     url,
 		},
 	}, nil
-
 }
diff --git a/extractors/youku/youku.go b/extractors/youku/youku.go
@@ -91,7 +91,6 @@ func youkuUps(vid string, option extractors.Options) (*youkuData, error) {
 	)
 	if strings.Contains(option.Cookie, "cna") {
 		utids = utils.MatchOneOf(option.Cookie, `cna=(.+?);`, `cna\s+(.+?)\s`, `cna\s+(.+?)$`)
-
 	} else {
 		headers, err := request.Headers("http://log.mmstat.com/eg.js", youkuReferer)
 		if err != nil {