Major linting fixes.

Author: bengarrett

.golangci.yml

@@ -1,142 +1,22 @@
-linters-settings:
-  depguard:
-    list-type: blacklist
-    packages:
-      # logging is allowed only by logutils.Log, logrus
-      # is allowed to use only in logutils package
-      - github.com/sirupsen/logrus
-    packages-with-error-message:
-      - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log"
-  dupl:
-    threshold: 100
-  funlen:
-    lines: 100
-    statements: 50
-  gci:
-    local-prefixes: github.com/golangci/golangci-lint
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-    disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
-  gocyclo:
-    min-complexity: 15
-  goimports:
-    local-prefixes: github.com/golangci/golangci-lint
-  golint:
-    min-confidence: 0
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
-  govet:
-    check-shadowing: true
-    settings:
-      printf:
-        funcs:
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-  lll:
-    line-length: 140
-  maligned:
-    suggest-new: true
-  misspell:
-    locale: US
-  nolintlint:
-    allow-leading-space: true # don't require machine-readable nolint directives (i.e. with no leading space)
-    allow-unused: false # report any unused nolint directives
-    require-explanation: false # don't require an explanation for nolint directives
-    require-specific: false # don't require nolint directives to be specific about which linter is being skipped
-
-linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
-  enable:
-    - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
-    - errcheck
-    - exportloopref
-    - exhaustive
-    - funlen
-    - gochecknoglobals
-    - gochecknoinits
-    - goconst
-    - gocritic
-    - gocyclo
-    - godot
-    - goerr113
-    - gofmt
-    - goimports
-    - gomnd
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - lll
-    - misspell
-    - nakedret
-    - noctx
-    - nolintlint
-    - revive
-    - rowserrcheck
-    - staticcheck
-    - structcheck
-    - stylecheck
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - varcheck
-    - whitespace
-
-  # don't enable:
-  # - asciicheck
-  # - scopelint
-  # - gocognit
-  # - godot
-  # - godox
-  # - interfacer
-  # - maligned
-  # - nestif
-  # - prealloc
-  # - testpackage
-  # - revive
-  # - wsl
-
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-
-    # https://github.com/go-critic/go-critic/issues/926
-    - linters:
-        - gocritic
-      text: "unnecessaryDefer:"
-
-run:
-  skip-dirs:
-    - test/testdata_etc
-    - internal/cache
-    - internal/renameio
-    - internal/robustio
+# golangci-lint run
+# gofumpt -l -w -s .
+
+linters:
+  enable-all: true
+  disable:
+    - interfacer # Deprecated
+    - scopelint # Deprecated
+    - golint # Deprecated
+    - maligned # Deprecated
+
+    - exhaustivestruct # 'It is not recommended to use it for all files in a project'
+    - forbidigo # forbids the use for fmt.Print(f|ln)
+    - nlreturn # opinionated
+    - paralleltest # causes tests to randomly fail
+    - wsl # whitespace linter, slow, aggressive and opinionated
+
+linters-settings:
+  cyclop:
+    max-complexity: 15 # default value 10 requires unnecessary refactoring
+  varnamelen:
+    min-name-length: 1 # default value 3 is too short

internal/misc/misc.go

@@ -42,7 +42,8 @@ func (e Export) Find(name string) string {
 	if !e[name] {
 		return name
 	}
-	i, new := 0, ""
+	i := 0
+	const maximum = 9999
 	for {
 		i++
 		ext := filepath.Ext(name)
@@ -54,11 +55,11 @@ func (e Export) Find(name string) string {
 			base = strings.Join(a[0:len(a)-1], "_")
 		}
 		suf := fmt.Sprintf("_%d", i+1)
-		new = fmt.Sprintf("%s%s%s", base, suf, ext)
-		if !e[new] {
-			return new
+		s := fmt.Sprintf("%s%s%s", base, suf, ext)
+		if !e[s] {
+			return s
 		}
-		if i > 9999 {
+		if i > maximum {
 			break
 		}
 	}

lib/example_posix_test.go

@@ -3,15 +3,17 @@
 
 // © Ben Garrett https://github.com/bengarrett/zipcmt
 
-package zipcmt
+package zipcmt_test
 
 import (
 	"fmt"
 	"log"
+
+	zipcmt "github.com/bengarrett/zipcmt/lib"
 )
 
 func ExampleConfig_Clean() {
-	c := Config{
+	c := zipcmt.Config{
 		SaveName: "..//test///.",
 	}
 	if err := c.Clean(); err != nil {
@@ -22,7 +24,7 @@ func ExampleConfig_Clean() {
 }
 
 func ExampleConfig_WalkDir() {
-	c := Config{
+	c := zipcmt.Config{
 		Print: true,
 		Dupes: true,
 	}

lib/example_test.go

@@ -1,38 +1,39 @@
 // © Ben Garrett https://github.com/bengarrett/zipcmt
 
-package zipcmt
+package zipcmt_test
 
 import (
 	"fmt"
 	"log"
 
+	zipcmt "github.com/bengarrett/zipcmt/lib"
 	"github.com/gookit/color"
 )
 
-func init() {
+func init() { // nolint:gochecknoinits
 	color.Enable = false
 }
 
 func ExampleRead() {
-	s, err := Read("../test/test-with-comment.zip", false)
+	s, err := zipcmt.Read("../test/test-with-comment.zip", false)
 	if err != nil {
 		log.Fatalln(err)
 	}
 	fmt.Print(s)
 	// Output:
-	//This is an example test comment for zipcmmt.
+	// This is an example test comment for zipcmmt.
 	//
 }
 
 func ExampleConfig_Status() {
-	c := Config{}
+	c := zipcmt.Config{}
 	c.SetTest()
 	if err := c.WalkDir("../test"); err != nil {
 		log.Panicln(err)
 	}
 	fmt.Print(c.Status())
 
-	c = Config{
+	c = zipcmt.Config{
 		Dupes: true,
 	}
 	c.SetTest()

lib/example_win_test.go

@@ -3,26 +3,26 @@
 
 // © Ben Garrett https://github.com/bengarrett/zipcmt
 
-package zipcmt
+package zipcmt_test
 
 import (
 	"fmt"
 	"log"
 )
 
 func ExampleConfig_clean() {
-	c := Config{
+	c := zipcmt.Config{
 		SaveName: "..//test///.",
 	}
-	if err := c.clean(); err != nil {
+	if err := c.Clean(); err != nil {
 		log.Fatalln(err)
 	}
 	fmt.Print(c.SaveName)
 	// Output: ..\test
 }
 
 func ExampleConfig_WalkDir() {
-	c := Config{
+	c := zipcmt.Config{
 		Print: true,
 		Dupes: true,
 	}

lib/log.go

@@ -37,27 +37,33 @@ func (c *Config) WriteLog(s string) {
 		d := filepath.Dir(c.LogName())
 		_, err := os.Stat(d)
 		if os.IsNotExist(err) {
-			os.MkdirAll(d, 0755)
+			const perm = 0o755
+			if err := os.MkdirAll(d, perm); err != nil {
+				log.Fatalln(err)
+			}
 		}
 	}
 
-	f, err1 := os.OpenFile(c.LogName(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	const perm = 0o644
+	f, err1 := os.OpenFile(c.LogName(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, perm)
 	if err1 != nil {
 		log.Fatalln(err1)
 	}
-	defer f.Close()
 
 	logger := log.New(f, "zipcmt|", log.LstdFlags)
 	st, err2 := f.Stat()
 	if err2 != nil {
+		f.Close()
 		log.Fatalln(err2)
 	}
+	defer f.Close()
 	if st.Size() == 0 {
 		c.logHeader(logger)
 	}
 	l := fmt.Sprintf("zip#: %07d; cmmt#: %07d; ", c.Zips, c.Cmmts)
 	if !c.Dupes {
-		l += fmt.Sprintf("hashes: %s; ", humanize.Bytes(uint64(len(c.hashes)*32)))
+		const hashLen = 32
+		l += fmt.Sprintf("hashes: %s; ", humanize.Bytes(uint64(len(c.hashes)*hashLen)))
 	}
 	if c.SaveName != "" {
 		l += fmt.Sprintf("names: %s; ", humanize.Bytes(uint64(c.names)))
@@ -69,12 +75,14 @@ func (c *Config) WriteLog(s string) {
 // logHeader creates a header for new log files that lists all the values of Config.
 func (c *Config) logHeader(logger *log.Logger) {
 	w := new(tabwriter.Writer)
-	w.Init(logger.Writer(), 0, 8, 0, '\t', 0)
+	const tabWidth = 8
+	w.Init(logger.Writer(), 0, tabWidth, 0, '\t', 0)
 	fmt.Fprintln(w, "Zip Comment Log - Configurations and arguments")
 	fmt.Fprintln(w, "")
 	// see: https://scene-si.org/2017/12/21/introduction-to-reflection/
 	v := reflect.ValueOf(c).Elem()
 	t := v.Type()
+
 	for i := 0; i < v.NumField(); i++ {
 		fmt.Fprintf(w, "%02d. %s:\t\t%v\n", i+1, t.Field(i).Name, v.Field(i))
 		if t.Field(i).Name == "test" {