fix staticcheck lint

davidnewhall · davidnewhall · commit 0578755d252d · 2026-06-14T21:07:50.000-07:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -11,8 +11,6 @@ linters:
     - cyclop
     - testpackage
     - wsl
-    #fix this
-    - staticcheck
     - embeddedstructfieldcheck # this is a trash rule.
     - funcorder # also lame.
     - noinlineerr # I like inline errors.
diff --git a/init/config/config.go b/init/config/config.go
@@ -72,13 +72,13 @@ func (h *Header) makeSection(name section, showHeader, showValue bool) string {
 		default:
 			fallthrough
 		case showValue:
-			buf.WriteString(fmt.Sprintf("%s%s = %s\n", space, param.Name, param.Value()))
+			fmt.Fprintf(&buf, "%s%s = %s\n", space, param.Name, param.Value())
 		case param.Example != nil:
 			// If example is not empty, use that commented out, otherwise use the default.
 			fallthrough
 		case h.Kind == list:
 			// If the 'kind' is a 'list', we comment all the parameters.
-			buf.WriteString(fmt.Sprintf("#%s%s = %s\n", space, param.Name, param.Value()))
+			fmt.Fprintf(&buf, "#%s%s = %s\n", space, param.Name, param.Value())
 		}
 	}
 
diff --git a/init/config/docusaurus.go b/init/config/docusaurus.go
@@ -138,7 +138,7 @@ func (h *Header) makeDocsTable(prefix string) string {
 			}
 		}
 
-		buf.WriteString(fmt.Sprintf(tableFormat, param.Name, envVar, def, param.Short))
+		fmt.Fprintf(&buf, tableFormat, param.Name, envVar, def, param.Short)
 	}
 
 	return buf.String()
diff --git a/pkg/unpackerr/cnfgfile.go b/pkg/unpackerr/cnfgfile.go
@@ -33,7 +33,7 @@ func (u *Unpackerr) unmarshalConfig() (uint64, uint64, string, error) {
 	// Load up the default file path and a list of alternate paths.
 	def, cfl := configFileLocactions()
 	// Search for one, starting with the default.
-	for _, configFile = range append([]string{u.Flags.ConfigFile}, cfl...) {
+	for _, configFile = range append([]string{u.ConfigFile}, cfl...) {
 		configFile = expandHomedir(configFile)
 		if _, err := os.Stat(configFile); err == nil {
 			break // found one, bail out.
@@ -46,20 +46,20 @@ func (u *Unpackerr) unmarshalConfig() (uint64, uint64, string, error) {
 	msg = msgNoConfigFile
 
 	if configFile != "" {
-		u.Flags.ConfigFile, _ = filepath.Abs(configFile)
-		msg = msgConfigFound + u.Flags.ConfigFileWithAge()
+		u.ConfigFile, _ = filepath.Abs(configFile)
+		msg = msgConfigFound + u.ConfigFileWithAge()
 
-		if err := cnfgfile.Unmarshal(u.Config, u.Flags.ConfigFile); err != nil {
+		if err := cnfgfile.Unmarshal(u.Config, u.ConfigFile); err != nil {
 			return 0, 0, msg, fmt.Errorf("config file: %w", err)
 		}
 	} else if f, err := u.createConfigFile(def); err != nil {
 		msg = msgConfigFailed + err.Error()
 	} else if f != "" {
-		u.Flags.ConfigFile = f
-		msg = msgConfigCreate + u.Flags.ConfigFileWithAge()
+		u.ConfigFile = f
+		msg = msgConfigCreate + u.ConfigFileWithAge()
 	}
 
-	if _, err := cnfg.UnmarshalENV(u.Config, u.Flags.EnvPrefix); err != nil {
+	if _, err := cnfg.UnmarshalENV(u.Config, u.EnvPrefix); err != nil {
 		return 0, 0, msg, fmt.Errorf("environment variables: %w", err)
 	}
 
@@ -178,7 +178,7 @@ func (u *Unpackerr) validateConfig() (uint64, uint64) { //nolint:cyclop
 	}
 
 	if u.KeepHistory != 0 {
-		u.History.Items = make([]string, u.KeepHistory)
+		u.Items = make([]string, u.KeepHistory)
 	}
 
 	return fileMode, dirMode
@@ -317,7 +317,7 @@ func (u *Unpackerr) validateApp(conf *StarrConfig, app starr.App) error {
 		conf.Protocols = defaultProtocol
 	}
 
-	conf.Config.Client = &http.Client{
+	conf.Client = &http.Client{
 		Timeout: conf.Timeout.Duration,
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: !conf.ValidSSL}, //nolint:gosec
diff --git a/pkg/unpackerr/folder.go b/pkg/unpackerr/folder.go
@@ -495,7 +495,7 @@ func (f *Folders) handleFileEvent(name, operation string) {
 // processEvent is here to process the event in the `*Unpackerr` scope before sending it back to the `*Folders` scope.
 func (u *Unpackerr) processEvent(event *eventData, now time.Time) {
 	// Do not watch our own log file.
-	if event.file == u.Config.LogFile || event.file == u.Config.Webserver.LogFile {
+	if event.file == u.LogFile || event.file == u.Webserver.LogFile {
 		return
 	}
 
diff --git a/pkg/unpackerr/handlers.go b/pkg/unpackerr/handlers.go
@@ -95,7 +95,7 @@ func (u *Unpackerr) extractCompletedDownloads(now time.Time) {
 // extractCompletedDownload checks if a completed starr download needs to be queued for extraction.
 // This is called by extractCompletedDownloads() via the main routine in start.go.
 func (u *Unpackerr) extractCompletedDownload(name string, now time.Time, item *Extract) {
-	if d := u.Config.StartDelay.Duration - now.Sub(item.Updated); d > time.Second { // wiggle room.
+	if d := u.StartDelay.Duration - now.Sub(item.Updated); d > time.Second { // wiggle room.
 		u.Printf("[%s] Waiting for Start Delay: %v (%v remains)", item.App, name, d.Round(time.Second))
 		return
 	}
@@ -316,7 +316,7 @@ func (u *Unpackerr) isComplete(status string, protocol starr.Protocol, protos st
 
 // added for https://github.com/Unpackerr/unpackerr/issues/235
 func (u *Unpackerr) hasSyncThingFile(dirPath string) string {
-	files, _ := u.Xtractr.GetFileList(dirPath)
+	files, _ := u.GetFileList(dirPath)
 	for _, file := range files {
 		if strings.HasSuffix(file, ".tmp") {
 			return file
diff --git a/pkg/unpackerr/history.go b/pkg/unpackerr/history.go
@@ -30,16 +30,16 @@ func (u *Unpackerr) updateHistory(item string) {
 		u.menu[histNone].Hide()
 	}
 
-	u.History.Items[0] = item
+	u.Items[0] = item
 
 	// Do not process 0; this isn't an `intrange`.
-	for idx := len(u.History.Items) - 1; idx > 0; idx-- {
+	for idx := len(u.Items) - 1; idx > 0; idx-- {
 		// u.History.Items is a slice with a set (identical) length and capacity.
-		switch u.History.Items[idx] = u.History.Items[idx-1]; {
+		switch u.Items[idx] = u.Items[idx-1]; {
 		case !ui.HasGUI():
 			continue
-		case u.History.Items[idx] != "":
-			u.menu[hist+strconv.Itoa(idx)].SetTitle(u.History.Items[idx])
+		case u.Items[idx] != "":
+			u.menu[hist+strconv.Itoa(idx)].SetTitle(u.Items[idx])
 			u.menu[hist+strconv.Itoa(idx)].Show()
 		default:
 			u.menu[hist+strconv.Itoa(idx)].Hide()
diff --git a/pkg/unpackerr/logs.go b/pkg/unpackerr/logs.go
@@ -133,24 +133,24 @@ func (u *Unpackerr) logCurrentQueue(now time.Time) {
 // setupLogging splits log write into a file and/or stdout.
 func (u *Unpackerr) setupLogging() {
 	if u.Config.Debug {
-		u.Logger.Info.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
-		u.Logger.Error.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
+		u.Info.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
+		u.Error.SetFlags(log.Lshortfile | log.Lmicroseconds | log.Ldate)
 	}
 
-	u.Config.LogFile = getLogFilePath(u.Config.LogFile, "unpackerr.log")
+	u.LogFile = getLogFilePath(u.LogFile, "unpackerr.log")
 	fileMode, _ := strconv.ParseUint(u.LogFileMode, bits8, base32)
 	rotate := &rotatorr.Config{
-		Filepath: u.Config.LogFile,                     // log file name.
-		FileSize: int64(u.Config.LogFileMb) * megabyte, // megabytes
+		Filepath: u.LogFile,                     // log file name.
+		FileSize: int64(u.LogFileMb) * megabyte, // megabytes
 		Rotatorr: &timerotator.Layout{
-			FileCount:  u.Config.LogFiles,
+			FileCount:  u.LogFiles,
 			PostRotate: u.postLogRotate,
 		}, // number of files to keep.
 		DirMode:  logsDirMode,
 		FileMode: os.FileMode(fileMode),
 	}
 
-	if u.Config.LogFile != "" {
+	if u.LogFile != "" {
 		var err error
 
 		u.rotatorr, err = rotatorr.New(rotate)
@@ -167,12 +167,12 @@ func (u *Unpackerr) setupLogging() {
 		stderr = os.Stderr
 	}
 
-	useLogFile := u.Config.LogFile != "" && u.rotatorr != nil
+	useLogFile := u.LogFile != "" && u.rotatorr != nil
 
 	switch { // only use MultiWriter if we have > 1 writer.
-	case !u.Config.Quiet && useLogFile:
+	case !u.Quiet && useLogFile:
 		u.updateLogOutput(io.MultiWriter(u.rotatorr, os.Stdout), io.MultiWriter(u.rotatorr, stderr))
-	case !u.Config.Quiet && !useLogFile:
+	case !u.Quiet && !useLogFile:
 		u.updateLogOutput(os.Stdout, stderr)
 	case !useLogFile:
 		u.updateLogOutput(io.Discard, io.Discard) // default is "nothing"
@@ -198,16 +198,16 @@ func (u *Unpackerr) updateLogOutput(writer io.Writer, errors io.Writer) {
 	if u.Webserver != nil && u.Webserver.LogFile != "" {
 		u.setupHTTPLogging()
 	} else {
-		u.Logger.HTTP.SetOutput(writer)
+		u.HTTP.SetOutput(writer)
 	}
 
 	if u.Config.Debug {
 		u.Logger.Debug.SetOutput(writer)
 	}
 
 	log.SetOutput(errors) // catch out-of-scope garbage
-	u.Logger.Info.SetOutput(writer)
-	u.Logger.Error.SetOutput(errors)
+	u.Info.SetOutput(writer)
+	u.Error.SetOutput(errors)
 	u.postLogRotate("", "")
 }
 
@@ -221,14 +221,14 @@ func (u *Unpackerr) setupHTTPLogging() {
 	}
 
 	switch { // only use MultiWriter if we have > 1 writer.
-	case !u.Config.Quiet && u.Webserver.LogFile != "":
-		u.Logger.HTTP.SetOutput(io.MultiWriter(rotatorr.NewMust(rotate), os.Stdout))
-	case !u.Config.Quiet && u.Webserver.LogFile == "":
-		u.Logger.HTTP.SetOutput(os.Stdout)
-	case u.Config.Quiet && u.Webserver.LogFile == "":
-		u.Logger.HTTP.SetOutput(io.Discard)
+	case !u.Quiet && u.Webserver.LogFile != "":
+		u.HTTP.SetOutput(io.MultiWriter(rotatorr.NewMust(rotate), os.Stdout))
+	case !u.Quiet && u.Webserver.LogFile == "":
+		u.HTTP.SetOutput(os.Stdout)
+	case u.Quiet && u.Webserver.LogFile == "":
+		u.HTTP.SetOutput(io.Discard)
 	default: // u.Config.Quiet && u.Webserver.LogFile != ""
-		u.Logger.HTTP.SetOutput(rotatorr.NewMust(rotate))
+		u.HTTP.SetOutput(rotatorr.NewMust(rotate))
 	}
 }
 
@@ -258,23 +258,23 @@ func (u *Unpackerr) logStartupInfo(msg string, externalFiles map[string]string)
 	u.logReadarr()
 	u.logWhisparr()
 	u.logFolders()
-	u.Printf(" => Parallel: %d", u.Config.Parallel)
-	u.Printf(" => Passwords: %d (rar/7z)", len(u.Config.Passwords))
-	u.Printf(" => Interval / Progress: %s/%s", u.Config.Interval.String(), u.Config.Progress.String())
-	u.Printf(" => Start/Delete Delay: %s/%s", u.Config.StartDelay.String(), u.Config.DeleteDelay.String())
-	u.Printf(" => Retry Delay: %v, max: %d", u.Config.RetryDelay, u.Config.MaxRetries)
+	u.Printf(" => Parallel: %d", u.Parallel)
+	u.Printf(" => Passwords: %d (rar/7z)", len(u.Passwords))
+	u.Printf(" => Interval / Progress: %s/%s", u.Interval.String(), u.Progress.String())
+	u.Printf(" => Start/Delete Delay: %s/%s", u.StartDelay.String(), u.DeleteDelay.String())
+	u.Printf(" => Retry Delay: %v, max: %d", u.RetryDelay, u.MaxRetries)
 	u.Printf(" => GUI / StdErr: %v / %v", ui.HasGUI(), u.ErrorStdErr)
-	u.Printf(" => Debug / Quiet: %v / %v", u.Config.Debug, u.Config.Quiet)
-	u.Printf(" => Activity / Queues: %v / %s", u.Config.Activity, u.Config.LogQueues.String())
+	u.Printf(" => Debug / Quiet: %v / %v", u.Config.Debug, u.Quiet)
+	u.Printf(" => Activity / Queues: %v / %s", u.Activity, u.LogQueues.String())
 
 	if runtime.GOOS != windows {
-		u.Printf(" => Directory & File Modes: %s & %s", u.Config.DirMode, u.Config.FileMode)
+		u.Printf(" => Directory & File Modes: %s & %s", u.DirMode, u.FileMode)
 	}
 
-	if u.Config.LogFile != "" {
+	if u.LogFile != "" {
 		msg := "no rotation"
-		if u.Config.LogFiles > 0 {
-			msg = fmt.Sprintf("%d @ %dMb", u.Config.LogFiles, u.Config.LogFileMb)
+		if u.LogFiles > 0 {
+			msg = fmt.Sprintf("%d @ %dMb", u.LogFiles, u.LogFileMb)
 		}
 
 		u.Printf(" => Log File: %s (%s, mode: %s)", u.LogFile, msg, u.LogFileMode)
diff --git a/pkg/unpackerr/start.go b/pkg/unpackerr/start.go
@@ -140,7 +140,7 @@ func Start() error {
 	log.SetFlags(log.LstdFlags) // in case we throw an error for main.go before logging is setup.
 
 	unpackerr := New().ParseFlags() // Grab CLI args (like config file location).
-	if unpackerr.Flags.verReq {
+	if unpackerr.verReq {
 		fmt.Println(version.Print("unpackerr")) //nolint:forbidigo
 		return nil                              // don't run anything else.
 	}
@@ -174,8 +174,8 @@ func Start() error {
 
 	unpackerr.logStartupInfo(msg, output)
 
-	if unpackerr.Flags.webhook > 0 {
-		return unpackerr.sampleWebhook(ExtractStatus(unpackerr.Flags.webhook))
+	if unpackerr.webhook > 0 {
+		return unpackerr.sampleWebhook(ExtractStatus(unpackerr.webhook))
 	}
 
 	unpackerr.Xtractr = xtractr.NewQueue(&xtractr.Config{
@@ -314,11 +314,11 @@ func dirIsEmpty(path string) bool {
 
 func (u *Unpackerr) watchCmdAndWebhooks() {
 	for hook := range u.hookChan {
-		if hook.WebhookConfig.URL != "" {
+		if hook.URL != "" {
 			u.sendWebhookWithLog(hook.WebhookConfig, hook.WebhookPayload)
 		}
 
-		if hook.WebhookConfig.Command != "" {
+		if hook.Command != "" {
 			u.runCmdhookWithLog(hook.WebhookConfig, hook.WebhookPayload)
 		}
 	}
@@ -331,10 +331,10 @@ func (u *Unpackerr) ParseFlags() *Unpackerr {
 		flag.PrintDefaults()
 	}
 
-	flag.StringVarP(&u.Flags.ConfigFile, "config", "c", os.Getenv("UN_CONFIG_FILE"), "Poller Config File (TOML Format)")
-	flag.StringVarP(&u.Flags.EnvPrefix, "prefix", "p", "UN", "Environment Variable Prefix")
-	flag.UintVarP(&u.Flags.webhook, "webhook", "w", 0, "Send test webhook. Valid values: 1,2,3,4,5,6,7,8")
-	flag.BoolVarP(&u.Flags.verReq, "version", "v", false, "Print the version and exit.")
+	flag.StringVarP(&u.ConfigFile, "config", "c", os.Getenv("UN_CONFIG_FILE"), "Poller Config File (TOML Format)")
+	flag.StringVarP(&u.EnvPrefix, "prefix", "p", "UN", "Environment Variable Prefix")
+	flag.UintVarP(&u.webhook, "webhook", "w", 0, "Send test webhook. Valid values: 1,2,3,4,5,6,7,8")
+	flag.BoolVarP(&u.verReq, "version", "v", false, "Print the version and exit.")
 	flag.Parse()
 
 	return u // so you can chain into ParseConfig.
@@ -343,11 +343,11 @@ func (u *Unpackerr) ParseFlags() *Unpackerr {
 // Run starts the loop that does the work.
 func (u *Unpackerr) Run() {
 	var (
-		poller   = time.NewTicker(u.Config.Interval.Duration)   // poll apps at configured interval.
-		cleaner  = time.NewTicker(cleanerInterval)              // clean at a fast interval.
-		xtractr  = time.NewTicker(u.Config.StartDelay.Duration) // Check if an extract needs to start.
-		progress = time.NewTicker(u.Config.Progress.Duration)   // Progress update for extractions.
-		now      = version.Started                              // Used for file system event time stamps.
+		poller   = time.NewTicker(u.Interval.Duration)   // poll apps at configured interval.
+		cleaner  = time.NewTicker(cleanerInterval)       // clean at a fast interval.
+		xtractr  = time.NewTicker(u.StartDelay.Duration) // Check if an extract needs to start.
+		progress = time.NewTicker(u.Progress.Duration)   // Progress update for extractions.
+		now      = version.Started                       // Used for file system event time stamps.
 	)
 
 	// Only start the queue/totals log timer when at least one app or folder is configured.
diff --git a/pkg/unpackerr/tray.go b/pkg/unpackerr/tray.go
@@ -33,7 +33,7 @@ func (u *Unpackerr) startTray() {
 }
 
 func (u *Unpackerr) exitTray() {
-	u.Xtractr.Stop() // stop and wait for extractions.
+	u.Stop() // stop and wait for extractions.
 	// because systray wants to control the exit code? no..
 	os.Exit(0)
 }
@@ -105,8 +105,8 @@ func (u *Unpackerr) watchGuiChannels() {
 		case <-u.menu["conf"].Clicked():
 			// does nothing on purpose
 		case <-u.menu["edit"].Clicked():
-			u.Printf("User Editing Config File: %s", u.Flags.ConfigFile)
-			_ = ui.OpenFile(u.Flags.ConfigFile)
+			u.Printf("User Editing Config File: %s", u.ConfigFile)
+			_ = ui.OpenFile(u.ConfigFile)
 		case <-u.menu["link"].Clicked():
 			// does nothing on purpose
 		case <-u.menu["info"].Clicked():
@@ -118,8 +118,8 @@ func (u *Unpackerr) watchGuiChannels() {
 		case <-u.menu["logs"].Clicked():
 			// does nothing on purpose
 		case <-u.menu["logs_view"].Clicked():
-			u.Printf("User Viewing Log File: %s", u.Config.LogFile)
-			_ = ui.OpenLog(u.Config.LogFile)
+			u.Printf("User Viewing Log File: %s", u.LogFile)
+			_ = ui.OpenLog(u.LogFile)
 		case <-u.menu["logs_rotate"].Clicked():
 			u.rotateLogs()
 		case <-u.menu["update"].Clicked():
diff --git a/pkg/unpackerr/webserver.go b/pkg/unpackerr/webserver.go
@@ -72,7 +72,7 @@ func (u *Unpackerr) startWebServer() {
 	// Make a multiplexer because websockets can't use apache log.
 	smx := http.NewServeMux()
 	smx.Handle(path.Join(u.Webserver.URLBase, "ws"), u.fixForwardedFor(u.Webserver.router))
-	smx.Handle("/", u.fixForwardedFor(apache.Wrap(u.Webserver.router, u.Logger.HTTP.Writer())))
+	smx.Handle("/", u.fixForwardedFor(apache.Wrap(u.Webserver.router, u.HTTP.Writer())))
 	u.webRoutes()
 
 	u.Webserver.server = &http.Server{
@@ -82,7 +82,7 @@ func (u *Unpackerr) startWebServer() {
 		ReadHeaderTimeout: defaultTimeout,
 		WriteTimeout:      0,
 		IdleTimeout:       defaultTimeout,
-		ErrorLog:          u.Logger.Error,
+		ErrorLog:          u.Error,
 	}
 
 	go u.runWebServer()
diff --git a/pkg/update/check.go b/pkg/update/check.go
@@ -84,9 +84,10 @@ func FillUpdate(release *GitHubReleasesLatest, version string) *Update {
 	}
 
 	arch := runtime.GOARCH
-	if arch == "arm" {
+	switch arch {
+	case "arm":
 		arch = "armhf"
-	} else if arch == "386" {
+	case "386":
 		arch = "i386"
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (h *Header) makeDocsTable(prefix string) string {`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`- buf.WriteString(fmt.Sprintf(tableFormat, param.Name, envVar, def, param.Short))`
	`141`	`+ fmt.Fprintf(&buf, tableFormat, param.Name, envVar, def, param.Short)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`return buf.String()`
Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ func (f *Folders) handleFileEvent(name, operation string) {`
`495`	`495`	// processEvent is here to process the event in the `Unpackerr` scope before sending it back to the `Folders` scope.
`496`	`496`	`func (u Unpackerr) processEvent(event eventData, now time.Time) {`
`497`	`497`	`// Do not watch our own log file.`
`498`		`- if event.file == u.Config.LogFile \|\| event.file == u.Config.Webserver.LogFile {`
	`498`	`+ if event.file == u.LogFile \|\| event.file == u.Webserver.LogFile {`
`499`	`499`	`return`
`500`	`500`	`}`
`501`	`501`