Fix linter config and lint problems

yangtfu · Jan 7, 2025 · 5f02b52 · 5f02b52
1 parent 669d559
commit 5f02b52
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - bilibili
+      - main
   pull_request:
     branches:
       - main

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,21 +1,16 @@
 linters:
   enable:
-    - structcheck
-    - varcheck
     - staticcheck
     - unconvert
     - gofmt
     - goimports
-    - golint
+    - revive
     - ineffassign
-    - vet
+    - govet
     - unused
     - misspell
     - bodyclose
-    - interfacer
     - unconvert
-    - maligned
-    # - depguard
     - nakedret
     - prealloc
     - whitespace
@@ -24,6 +19,6 @@ linters:
 
 run:
   deadline: 3m
-  skip-dirs:
+  issues.exclude-dirs:
     - bin
     - docs
diff --git a/cmd/podsync/main.go b/cmd/podsync/main.go
@@ -239,9 +239,8 @@ func main() {
 		log.Infof("running listener at %s", srv.Addr)
 		if cfg.Server.TLS {
 			return srv.ListenAndServeTLS(cfg.Server.CertificatePath, cfg.Server.KeyFilePath)
-		} else {
-			return srv.ListenAndServe()
 		}
+		return srv.ListenAndServe()
 	})
 
 	group.Go(func() error {

diff --git a/pkg/builder/bilibili.go b/pkg/builder/bilibili.go
@@ -21,7 +21,7 @@ func (b *BilibiliBuilder) queryFeed(feed *model.Feed, info *model.Info) error {
 	switch info.LinkType {
 	case model.TypeChannel:
 		//TODO channel surpport
-		return errors.New("Bilibili channel not supported.")
+		return errors.New("bilibili channel not supported")
 	case model.TypeUser:
 		// query user info
 		mid, err := strconv.Atoi(info.ItemID)
@@ -69,7 +69,7 @@ func (b *BilibiliBuilder) queryFeed(feed *model.Feed, info *model.Info) error {
 	}
 }
 
-func (b *BilibiliBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.Feed, error) {
+func (b *BilibiliBuilder) Build(_ context.Context, cfg *feed.Config) (*model.Feed, error) {
 	info, err := ParseURL(cfg.URL)
 	if err != nil {
 		return nil, err

diff --git a/pkg/builder/soundcloud.go b/pkg/builder/soundcloud.go
@@ -16,7 +16,7 @@ type SoundCloudBuilder struct {
 	client *soundcloudapi.API
 }
 
-func (s *SoundCloudBuilder) Build(_ctx context.Context, cfg *feed.Config) (*model.Feed, error) {
+func (s *SoundCloudBuilder) Build(_ context.Context, cfg *feed.Config) (*model.Feed, error) {
 	info, err := ParseURL(cfg.URL)
 	if err != nil {
 		return nil, err

diff --git a/pkg/builder/vimeo.go b/pkg/builder/vimeo.go
@@ -158,7 +158,7 @@ func (v *VimeoBuilder) queryVideos(getVideos getVideosFunc, feed *model.Feed) er
 	}
 }
 
-func (v *VimeoBuilder) Build(ctx context.Context, cfg *feed.Config) (*model.Feed, error) {
+func (v *VimeoBuilder) Build(_ context.Context, cfg *feed.Config) (*model.Feed, error) {
 	info, err := ParseURL(cfg.URL)
 	if err != nil {
 		return nil, err

diff --git a/pkg/db/badger.go b/pkg/db/badger.go
@@ -105,9 +105,7 @@ func (b *Badger) AddFeed(_ context.Context, feedID string, feed *model.Feed) err
 		for _, episode := range feed.Episodes {
 			episodeKey := b.getKey(episodePath, feedID, episode.ID)
 			err := b.setObj(txn, episodeKey, episode, false)
-			if err == nil || err == model.ErrAlreadyExists {
-				// Do nothing
-			} else {
+			if !(err == nil || err == model.ErrAlreadyExists) {
 				return errors.Wrapf(err, "failed to save episode %q", feedID)
 			}
 		}
@@ -226,7 +224,7 @@ func (b *Badger) DeleteEpisode(feedID, episodeID string) error {
 	})
 }
 
-func (b *Badger) WalkEpisodes(ctx context.Context, feedID string, cb func(episode *model.Episode) error) error {
+func (b *Badger) WalkEpisodes(_ context.Context, feedID string, cb func(episode *model.Episode) error) error {
 	return b.db.View(func(txn *badger.Txn) error {
 		return b.walkEpisodes(txn, feedID, cb)
 	})
@@ -274,9 +272,7 @@ func (b *Badger) setObj(txn *badger.Txn, key []byte, obj interface{}, overwrite
 		_, err := txn.Get(key)
 		if err == nil {
 			return model.ErrAlreadyExists
-		} else if err == badger.ErrKeyNotFound {
-			// Key not found, do nothing
-		} else {
+		} else if err != badger.ErrKeyNotFound {
 			return errors.Wrap(err, "failed to check whether key exists")
 		}
 	}

diff --git a/pkg/db/badger_test.go b/pkg/db/badger_test.go
@@ -104,7 +104,7 @@ func TestBadger_DeleteFeed(t *testing.T) {
 	assert.NoError(t, err)
 
 	called := 0
-	err = db.WalkFeeds(testCtx, func(feed *model.Feed) error {
+	err = db.WalkFeeds(testCtx, func(_ *model.Feed) error {
 		called++
 		return nil
 	})

diff --git a/pkg/feed/xml.go b/pkg/feed/xml.go
@@ -30,7 +30,7 @@ func (p timeSlice) Swap(i, j int) {
 	p[i], p[j] = p[j], p[i]
 }
 
-func Build(_ctx context.Context, feed *model.Feed, cfg *Config, hostname string) (*itunes.Podcast, error) {
+func Build(_ context.Context, feed *model.Feed, cfg *Config, hostname string) (*itunes.Podcast, error) {
 	const (
 		podsyncGenerator = "Podsync generator (support us at https://github.com/mxpv/podsync)"
 		defaultCategory  = "TV & Film"

diff --git a/pkg/fs/local.go b/pkg/fs/local.go
@@ -30,12 +30,12 @@ func (l *Local) Open(name string) (http.File, error) {
 	return os.Open(path)
 }
 
-func (l *Local) Delete(_ctx context.Context, name string) error {
+func (l *Local) Delete(_ context.Context, name string) error {
 	path := filepath.Join(l.rootDir, name)
 	return os.Remove(path)
 }
 
-func (l *Local) Create(_ctx context.Context, name string, reader io.Reader) (int64, error) {
+func (l *Local) Create(_ context.Context, name string, reader io.Reader) (int64, error) {
 	var (
 		logger = log.WithField("name", name)
 		path   = filepath.Join(l.rootDir, name)
@@ -71,7 +71,7 @@ func (l *Local) copyFile(source io.Reader, destinationPath string) (int64, error
 	return written, nil
 }
 
-func (l *Local) Size(_ctx context.Context, name string) (int64, error) {
+func (l *Local) Size(_ context.Context, name string) (int64, error) {
 	file, err := l.Open(name)
 	if err != nil {
 		return 0, err

diff --git a/pkg/fs/s3.go b/pkg/fs/s3.go
@@ -55,7 +55,7 @@ func NewS3(c S3Config) (*S3, error) {
 	}, nil
 }
 
-func (s *S3) Open(_name string) (http.File, error) {
+func (s *S3) Open(_ string) (http.File, error) {
 	return nil, errors.New("serving files from S3 is not supported")
 }
 

diff --git a/pkg/fs/s3_test.go b/pkg/fs/s3_test.go
@@ -104,14 +104,14 @@ func (m *mockS3API) PutObjectRequest(input *s3.PutObjectInput) (*request.Request
 	return req, &s3.PutObjectOutput{}
 }
 
-func (m *mockS3API) HeadObjectWithContext(ctx aws.Context, input *s3.HeadObjectInput, opts ...request.Option) (*s3.HeadObjectOutput, error) {
+func (m *mockS3API) HeadObjectWithContext(_ aws.Context, input *s3.HeadObjectInput, _ ...request.Option) (*s3.HeadObjectOutput, error) {
 	if _, ok := m.files[*input.Key]; ok {
 		return &s3.HeadObjectOutput{ContentLength: aws.Int64(int64(len(m.files[*input.Key])))}, nil
 	}
 	return nil, awserr.New("NotFound", "", nil)
 }
 
-func (m *mockS3API) DeleteObjectWithContext(ctx aws.Context, input *s3.DeleteObjectInput, opts ...request.Option) (*s3.DeleteObjectOutput, error) {
+func (m *mockS3API) DeleteObjectWithContext(_ aws.Context, input *s3.DeleteObjectInput, _ ...request.Option) (*s3.DeleteObjectOutput, error) {
 	if _, ok := m.files[*input.Key]; ok {
 		delete(m.files, *input.Key)
 		return &s3.DeleteObjectOutput{}, nil

diff --git a/services/update/updater.go b/services/update/updater.go
@@ -219,9 +219,7 @@ func (u *Manager) downloadEpisodes(ctx context.Context, feedConfig *feed.Config)
 			}
 
 			continue
-		} else if os.IsNotExist(err) {
-			// Will download, do nothing here
-		} else {
+		} else if !os.IsNotExist(err) {
 			logger.WithError(err).Error("failed to stat file")
 			return err
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ func NewS3(c S3Config) (*S3, error) { @@
     	}, nil
     }
-    func (s *S3) Open(_name string) (http.File, error) {
+    func (s *S3) Open(_ string) (http.File, error) {
     	return nil, errors.New("serving files from S3 is not supported")
     }
@@ Expand Down @@