fixin lint

Unpackerr · Jan 18, 2024 · 4a244ff · 4a244ff
1 parent fa82ce6
commit 4a244ff
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/codetests.yml b/.github/workflows/codetests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: 'v1.54'
+          version: 'v1.55'
 
   golangci-linux:
     # description: "Runs golangci-lint on linux against linux and windows."
@@ -60,4 +60,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: 'v1.54'
+          version: 'v1.55'
diff --git a/pkg/unpackerr/folder.go b/pkg/unpackerr/folder.go
@@ -279,7 +279,7 @@ func (u *Unpackerr) folderXtractrCallback(resp *xtractr.Response) {
 		folder.step = EXTRACTING //nolint:wsl
 	case errors.Is(resp.Error, xtractr.ErrNoCompressedFiles):
 		folder.step = EXTRACTEDNOTHING
-		u.Printf("[Folder] Nothing Extracted: %s: %v", resp.X.Name, resp.Error)
+		u.Printf("[Folder] %s: %s: %v", folder.step.Desc(), resp.X.Name, resp.Error)
 	case resp.Error != nil:
 		folder.step = EXTRACTFAILED
 		u.Errorf("[Folder] %s: %s: %v", folder.step.Desc(), resp.X.Name, resp.Error)

diff --git a/pkg/unpackerr/lidarr.go b/pkg/unpackerr/lidarr.go
@@ -77,17 +77,15 @@ func (u *Unpackerr) validateLidarr() error {
 
 func (u *Unpackerr) logLidarr() {
 	if c := len(u.Lidarr); c == 1 {
-		u.Printf(" => Lidarr Config: 1 server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-			"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+		u.Printf(" => Lidarr Config: 1 server: "+starrLogLine,
 			u.Lidarr[0].URL, u.Lidarr[0].APIKey != "", u.Lidarr[0].Timeout,
 			u.Lidarr[0].ValidSSL, u.Lidarr[0].Protocols, u.Lidarr[0].Syncthing,
 			u.Lidarr[0].DeleteOrig, u.Lidarr[0].DeleteDelay.Duration, u.Lidarr[0].Paths)
 	} else {
 		u.Printf(" => Lidarr Config: %d servers", c)
 
 		for _, f := range u.Lidarr {
-			u.Printf(" =>    Server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-				"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+			u.Printf(starrLogPfx+starrLogLine,
 				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
 				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
 		}

diff --git a/pkg/unpackerr/logs.go b/pkg/unpackerr/logs.go
@@ -14,9 +14,12 @@ import (
 
 // satisfy gomnd.
 const (
-	callDepth   = 2 // log the line that called us.
-	megabyte    = 1024 * 1024
-	logsDirMode = 0o755
+	callDepth    = 2 // log the line that called us.
+	megabyte     = 1024 * 1024
+	logsDirMode  = 0o755
+	starrLogPfx  = " =>    Server: "
+	starrLogLine = "%s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, " +
+		"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q"
 )
 
 // ExtractStatus is our enum for an extract's status.

diff --git a/pkg/unpackerr/radarr.go b/pkg/unpackerr/radarr.go
@@ -77,17 +77,15 @@ func (u *Unpackerr) validateRadarr() error {
 
 func (u *Unpackerr) logRadarr() {
 	if c := len(u.Radarr); c == 1 {
-		u.Printf(" => Radarr Config: 1 server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-			"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+		u.Printf(" => Radarr Config: 1 server: "+starrLogLine,
 			u.Radarr[0].URL, u.Radarr[0].APIKey != "", u.Radarr[0].Timeout,
 			u.Radarr[0].ValidSSL, u.Radarr[0].Protocols, u.Radarr[0].Syncthing,
 			u.Radarr[0].DeleteOrig, u.Radarr[0].DeleteDelay.Duration, u.Radarr[0].Paths)
 	} else {
 		u.Printf(" => Radarr Config: %d servers", c)
 
 		for _, f := range u.Radarr {
-			u.Printf(" =>    Server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-				"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+			u.Printf(starrLogPfx+starrLogLine,
 				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
 				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
 		}

diff --git a/pkg/unpackerr/readarr.go b/pkg/unpackerr/readarr.go
@@ -77,17 +77,15 @@ func (u *Unpackerr) validateReadarr() error {
 
 func (u *Unpackerr) logReadarr() {
 	if c := len(u.Readarr); c == 1 {
-		u.Printf(" => Readarr Config: 1 server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-			"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+		u.Printf(" => Readarr Config: 1 server: "+starrLogLine,
 			u.Readarr[0].URL, u.Readarr[0].APIKey != "", u.Readarr[0].Timeout,
 			u.Readarr[0].ValidSSL, u.Readarr[0].Protocols, u.Readarr[0].Syncthing,
 			u.Readarr[0].DeleteOrig, u.Readarr[0].DeleteDelay.Duration, u.Readarr[0].Paths)
 	} else {
 		u.Printf(" => Readarr Config: %d servers", c)
 
 		for _, f := range u.Readarr {
-			u.Printf(" =>    Server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-				"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+			u.Printf(starrLogPfx+starrLogLine,
 				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
 				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
 		}

diff --git a/pkg/unpackerr/sonarr.go b/pkg/unpackerr/sonarr.go
@@ -77,17 +77,15 @@ func (u *Unpackerr) validateSonarr() error {
 
 func (u *Unpackerr) logSonarr() {
 	if c := len(u.Sonarr); c == 1 {
-		u.Printf(" => Sonarr Config: 1 server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-			"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+		u.Printf(" => Sonarr Config: 1 server: "+starrLogLine,
 			u.Sonarr[0].URL, u.Sonarr[0].APIKey != "", u.Sonarr[0].Timeout,
 			u.Sonarr[0].ValidSSL, u.Sonarr[0].Protocols, u.Sonarr[0].Syncthing,
 			u.Sonarr[0].DeleteOrig, u.Sonarr[0].DeleteDelay.Duration, u.Sonarr[0].Paths)
 	} else {
 		u.Printf(" => Sonarr Config: %d servers", c)
 
 		for _, f := range u.Sonarr {
-			u.Printf(" =>    Server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-				"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+			u.Printf(starrLogPfx+starrLogLine,
 				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
 				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
 		}

diff --git a/pkg/unpackerr/whisparr.go b/pkg/unpackerr/whisparr.go
@@ -82,17 +82,15 @@ func (u *Unpackerr) validateWhisparr() error {
 
 func (u *Unpackerr) logWhisparr() {
 	if count := len(u.Whisparr); count == 1 {
-		u.Printf(" => Whisparr Config: 1 server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-			"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+		u.Printf(" => Whisparr Config: 1 server: "+starrLogLine,
 			u.Whisparr[0].URL, u.Whisparr[0].APIKey != "", u.Whisparr[0].Timeout,
 			u.Whisparr[0].ValidSSL, u.Whisparr[0].Protocols, u.Whisparr[0].Syncthing,
 			u.Whisparr[0].DeleteOrig, u.Whisparr[0].DeleteDelay.Duration, u.Whisparr[0].Paths)
 	} else if count != 0 {
 		u.Printf(" => Whisparr Config: %d servers", count)
 
 		for _, f := range u.Whisparr {
-			u.Printf(" =>    Server: %s, apikey:%v, timeout:%v, verify ssl:%v, protos:%s, "+
-				"syncthing: %v, delete_orig: %v, delete_delay: %v, paths:%q",
+			u.Printf(starrLogPfx+starrLogLine,
 				f.URL, f.APIKey != "", f.Timeout, f.ValidSSL, f.Protocols,
 				f.Syncthing, f.DeleteOrig, f.DeleteDelay.Duration, f.Paths)
 		}