fix(ui): satisfy lint on zenity dialog helpers

SergioChan · SergioChan · commit 4c9e5776cbb3 · 2026-03-12T09:42:33.000-07:00
diff --git a/pkg/ui/dlgs.go b/pkg/ui/dlgs.go
@@ -14,7 +14,11 @@ func dialogResult(err error) (bool, error) {
 		return false, nil
 	}
 
-	return err == nil, err
+	if err != nil {
+		return false, fmt.Errorf("zenity dialog: %w", err)
+	}
+
+	return true, nil
 }
 
 // Warning wraps a warning dialog.
@@ -27,21 +31,21 @@ func Warning(title, msg string) (bool, error) {
 }
 
 // Error wraps an error dialog.
-func Error(title, msg string, v ...any) (bool, error) {
+func Error(title, msg string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
 
-	return dialogResult(zenity.Error(fmt.Sprintf(msg, v...), zenity.Title(title)))
+	return dialogResult(zenity.Error(fmt.Sprintf(msg, args...), zenity.Title(title)))
 }
 
 // Info wraps an info dialog.
-func Info(title, msg string, v ...any) (bool, error) {
+func Info(title, msg string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
 
-	return dialogResult(zenity.Info(fmt.Sprintf(msg, v...), zenity.Title(title)))
+	return dialogResult(zenity.Info(fmt.Sprintf(msg, args...), zenity.Title(title)))
 }
 
 // Entry wraps a text-entry dialog.
@@ -54,12 +58,15 @@ func Entry(title, msg, val string) (string, bool, error) {
 	if errors.Is(err, zenity.ErrCanceled) {
 		return val, false, nil
 	}
+	if err != nil {
+		return entry, false, fmt.Errorf("zenity entry: %w", err)
+	}
 
-	return entry, err == nil, err
+	return entry, true, nil
 }
 
 // Question wraps a question dialog.
-func Question(title string, defaultCancel bool, text string, v ...any) (bool, error) {
+func Question(title string, defaultCancel bool, text string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
@@ -69,5 +76,5 @@ func Question(title string, defaultCancel bool, text string, v ...any) (bool, er
 		opts = append(opts, zenity.DefaultCancel())
 	}
 
-	return dialogResult(zenity.Question(fmt.Sprintf(text, v...), opts...))
+	return dialogResult(zenity.Question(fmt.Sprintf(text, args...), opts...))
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ func dialogResult(err error) (bool, error) {`
`14`	`14`	`return false, nil`
`15`	`15`	`}`
`16`	`16`
`17`		`- return err == nil, err`
	`17`	`+ if err != nil {`
	`18`	`+ return false, fmt.Errorf("zenity dialog: %w", err)`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ return true, nil`
`18`	`22`	`}`
`19`	`23`
`20`	`24`	`// Warning wraps a warning dialog.`
`@@ -27,21 +31,21 @@ func Warning(title, msg string) (bool, error) {`
`27`	`31`	`}`
`28`	`32`
`29`	`33`	`// Error wraps an error dialog.`
`30`		`-func Error(title, msg string, v ...any) (bool, error) {`
	`34`	`+func Error(title, msg string, args ...any) (bool, error) {`
`31`	`35`	`if !HasGUI() {`
`32`	`36`	`return true, nil`
`33`	`37`	`}`
`34`	`38`
`35`		`- return dialogResult(zenity.Error(fmt.Sprintf(msg, v...), zenity.Title(title)))`
	`39`	`+ return dialogResult(zenity.Error(fmt.Sprintf(msg, args...), zenity.Title(title)))`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`// Info wraps an info dialog.`
`39`		`-func Info(title, msg string, v ...any) (bool, error) {`
	`43`	`+func Info(title, msg string, args ...any) (bool, error) {`
`40`	`44`	`if !HasGUI() {`
`41`	`45`	`return true, nil`
`42`	`46`	`}`
`43`	`47`
`44`		`- return dialogResult(zenity.Info(fmt.Sprintf(msg, v...), zenity.Title(title)))`
	`48`	`+ return dialogResult(zenity.Info(fmt.Sprintf(msg, args...), zenity.Title(title)))`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`// Entry wraps a text-entry dialog.`
`@@ -54,12 +58,15 @@ func Entry(title, msg, val string) (string, bool, error) {`
`54`	`58`	`if errors.Is(err, zenity.ErrCanceled) {`
`55`	`59`	`return val, false, nil`
`56`	`60`	`}`
	`61`	`+ if err != nil {`
	`62`	`+ return entry, false, fmt.Errorf("zenity entry: %w", err)`
	`63`	`+ }`
`57`	`64`
`58`		`- return entry, err == nil, err`
	`65`	`+ return entry, true, nil`
`59`	`66`	`}`
`60`	`67`
`61`	`68`	`// Question wraps a question dialog.`
`62`		`-func Question(title string, defaultCancel bool, text string, v ...any) (bool, error) {`
	`69`	`+func Question(title string, defaultCancel bool, text string, args ...any) (bool, error) {`
`63`	`70`	`if !HasGUI() {`
`64`	`71`	`return true, nil`
`65`	`72`	`}`
`@@ -69,5 +76,5 @@ func Question(title string, defaultCancel bool, text string, v ...any) (bool, er`
`69`	`76`	`opts = append(opts, zenity.DefaultCancel())`
`70`	`77`	`}`
`71`	`78`
`72`		`- return dialogResult(zenity.Question(fmt.Sprintf(text, v...), opts...))`
	`79`	`+ return dialogResult(zenity.Question(fmt.Sprintf(text, args...), opts...))`
`73`	`80`	`}`