fix wsl_v5

Author: davidnewhall

.golangci.yml

@@ -14,7 +14,6 @@ linters:
     - embeddedstructfieldcheck # this is a trash rule.
     - funcorder # also lame.
     - noinlineerr # I like inline errors.
-    - wsl_v5 # this one sucks compared to wsl, and lacks configurability.
     - goconst # noisy af.
     - gomodguard # deprecated.
 

pkg/unpackerr/cmdhook.go

@@ -49,12 +49,12 @@ func (u *Unpackerr) runCmdhookWithLog(hook *WebhookConfig, payload *WebhookPaylo
 
 	hook.Lock() // we only lock for the integer increments.
 	defer hook.Unlock()
-	hook.posts++ //nolint:wsl
+	hook.posts++ //nolint:wsl_v5
 
 	switch {
 	case err != nil:
 		u.Errorf("Command Hook (%s) %s: %v: %s", payload.Event, hook.Name, err, out.String())
-		hook.fails++ //nolint:wsl
+		hook.fails++
 	case hook.Silent || out == nil:
 		u.Printf("[Cmdhook] Queue: %d/%d. Ran command %s", len(u.hookChan), cap(u.hookChan), hook.Name)
 	default:
@@ -127,7 +127,7 @@ func (u *Unpackerr) logCmdhook() {
 		prefix = " => Command Hook Config: 1 cmd"
 	} else {
 		u.Printf(" => Command Hook Configs: %d commands", len(u.Cmdhook))
-		prefix = " =>    Command" //nolint:wsl
+		prefix = " =>    Command" //nolint:wsl_v5
 	}
 
 	for _, f := range u.Cmdhook {

pkg/unpackerr/folder.go

@@ -141,6 +141,7 @@ func (u *Unpackerr) PollFolders() {
 	}
 
 	go u.folders.watchFSNotify()
+
 	u.Printf("[Folder] Watching (fsnotify): %s", strings.Join(flist, ", "))
 
 	// Setting an interval of any value less than 5 milliseconds
@@ -154,6 +155,7 @@ func (u *Unpackerr) PollFolders() {
 			u.Errorf("Folder poller stopped: %v", err)
 		}
 	}()
+
 	u.Printf("[Folder] Polling @ %s: %s", u.Folder.Interval.String(), strings.Join(flist, ", "))
 }
 
@@ -597,7 +599,7 @@ func (u *Unpackerr) checkFolderStats(now time.Time) {
 	}
 }
 
-//nolint:wsl
+//nolint:wsl_v5
 func (u *Unpackerr) deleteAfterReached(name string, now time.Time, folder *Folder) {
 	var webhook bool
 	// Folder reached delete delay (after extraction), nuke it.

pkg/unpackerr/handlers.go

@@ -209,15 +209,15 @@ func (u *Unpackerr) checkExtractDone(now time.Time) {
 
 			if item.DeleteOrig {
 				u.delChan <- &fileDeleteReq{Paths: []string{item.Path}}
-				webhook = true
+				webhook = true //nolint:wsl_v5
 			} else if item.Resp != nil && len(item.Resp.NewFiles) > 0 && item.DeleteDelay >= 0 {
 				// Delete extracted files and purge empty parents up to and including the download path.
 				u.delChan <- &fileDeleteReq{
 					Paths:            item.Resp.NewFiles,
 					PurgeEmptyParent: true,
 					PurgeEmptyRoot:   item.Path,
 				}
-				webhook = true
+				webhook = true //nolint:wsl_v5
 			}
 
 			u.updateQueueStatus(&newStatus{Name: name, Status: DELETED, Resp: item.Resp}, now, webhook)

pkg/unpackerr/metrics.go

@@ -39,6 +39,8 @@ func (c *MetricsCollector) Describe(ch chan<- *prometheus.Desc) {
 }
 
 // Collect satisfies the Prometheus custom metrics collector.
+//
+//nolint:wsl_v5
 func (c *MetricsCollector) Collect(metrics chan<- prometheus.Metric) {
 	stats := c.stats()
 	newMetric := prometheus.MustNewConstMetric

pkg/unpackerr/start.go

@@ -191,6 +191,7 @@ func Start() error {
 	}
 
 	go unpackerr.watchDeleteChannel()
+
 	unpackerr.startWebServer()
 	unpackerr.watchWorkThread()
 	unpackerr.startTray() // runs tray or waits for exit depending on hasGUI.

pkg/unpackerr/tray.go

@@ -232,11 +232,13 @@ func (u *Unpackerr) checkForUpdate() {
 	}
 
 	const limitUnit = 3
+
 	ago := durafmt.Parse(time.Since(update.RelDate)).LimitFirstN(limitUnit).Format(durafmtUnits)
 
 	if !update.Outdate {
 		_, _ = ui.Info("Unpackerr", "You're up to date! Version: %s\nUpdated: %s (%s ago)",
 			update.Version, update.RelDate.Format("Jan 2, 2006"), ago)
+
 		return
 	}
 

pkg/unpackerr/webhook.go

@@ -272,7 +272,7 @@ func (u *Unpackerr) logWebhook() {
 		prefix = " => Webhook Config: 1 URL"
 	} else {
 		u.Printf(" => Webhook Configs: %d URLs", len(u.Webhook))
-		prefix = " =>    URL" //nolint:wsl
+		prefix = " =>    URL" //nolint:wsl_v5
 	}
 
 	for _, hook := range u.Webhook {