Run "go fix" and "go fmt"

xyproto · xyproto · commit 056965611b4c · 2026-06-04T22:36:07.000+02:00
diff --git a/backend.go b/backend.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package wallutils
 
diff --git a/backend_nocgo.go b/backend_nocgo.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package wallutils
 
diff --git a/closest.go b/closest.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package wallutils
 
diff --git a/closest_nocgo.go b/closest_nocgo.go
@@ -1,5 +1,4 @@
 //go:build !cgo
-// +build !cgo
 
 package wallutils
 
diff --git a/cmd/lscollection/main.go b/cmd/lscollection/main.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"text/tabwriter"
 
 	"github.com/urfave/cli"
@@ -12,12 +13,7 @@ import (
 
 // has checks if the given string slice contains the given string
 func has(sl []string, s string) bool {
-	for _, e := range sl {
-		if e == s {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(sl, s)
 }
 
 func listWallpaperCollectionAction(c *cli.Context) error {
diff --git a/cmd/setwallpaper/main.go b/cmd/setwallpaper/main.go
@@ -113,7 +113,7 @@ func downloadDirectory() string {
 	// Check if XDG_DOWNLOAD_DIR is defined in ~/.config/user-dirs.dirs
 	dirfileContents, err := os.ReadFile(expanduser("~/.config/user-dirs.dirs"))
 	if err == nil {
-		for _, line := range strings.Split(string(dirfileContents), "\n") {
+		for line := range strings.SplitSeq(string(dirfileContents), "\n") {
 			if strings.HasPrefix(line, "XDG_DOWNLOAD_DIR") {
 				elements := strings.SplitN(line, "=", 2)
 				path = strings.TrimSpace(elements[1])
diff --git a/collections.go b/collections.go
@@ -159,7 +159,7 @@ func (sr *SearchResults) visit(path string, _ os.FileInfo, _ error) error {
 // sortWallpapers sorts the found wallpapers
 func (sr *SearchResults) sortWallpapers() {
 	var collected []*Wallpaper
-	sr.wallpapers.Range(func(_, value interface{}) bool {
+	sr.wallpapers.Range(func(_, value any) bool {
 		wp, ok := value.(*Wallpaper)
 		if !ok {
 			// internal error
@@ -181,7 +181,7 @@ func (sr *SearchResults) sortWallpapers() {
 // sortGnomeTimedWallpapers sorts the Found gnome Timed Wallpapers
 func (sr *SearchResults) sortGnomeTimedWallpapers() {
 	var collected []*gnometimed.Wallpaper
-	sr.gnomeWallpapers.Range(func(_, value interface{}) bool {
+	sr.gnomeWallpapers.Range(func(_, value any) bool {
 		gw, ok := value.(*gnometimed.Wallpaper)
 		if !ok {
 			// internal error
@@ -200,7 +200,7 @@ func (sr *SearchResults) sortGnomeTimedWallpapers() {
 // sortSimpleTimedWallpapers sorts the found Simple Timed Wallpapers
 func (sr *SearchResults) sortSimpleTimedWallpapers() {
 	var collected []*simpletimed.Wallpaper
-	sr.simpleTimedWallpapers.Range(func(_, value interface{}) bool {
+	sr.simpleTimedWallpapers.Range(func(_, value any) bool {
 		stw, ok := value.(*simpletimed.Wallpaper)
 		if !ok {
 			// internal error
diff --git a/pkg/event/cmd/clock/main.go b/pkg/event/cmd/clock/main.go
@@ -9,8 +9,8 @@ import (
 
 func clockSystem() *event.EventSys {
 	sys := event.NewSystem(1 * time.Second)
-	for hour := 0; hour < 24; hour++ {
-		for minute := 0; minute < 60; minute++ {
+	for hour := range 24 {
+		for minute := range 60 {
 			// Create new variables that can be closed over by the new function below
 			hour := hour
 			minute := minute
diff --git a/pkg/event/eventsys.go b/pkg/event/eventsys.go
@@ -142,7 +142,7 @@ func (sys *EventSys) ClockEvent(h, m int, f func() error) {
 
 // EveryMinute will trigger an event every minute for n minutes, starting from h:m
 func (sys *EventSys) EveryMinute(h, m, n int, f func() error) {
-	for i := 0; i < n; i++ {
+	for range n {
 		sys.Register(NewClockEvent(h, m, f))
 		m++
 		if m >= 60 {
diff --git a/pkg/gnometimed/convert.go b/pkg/gnometimed/convert.go
@@ -48,7 +48,7 @@ func GnomeToSimpleString(gtw *Wallpaper) (string, error) {
 
 	// First, only gather all the image filenames
 	var filenames []string
-	for i := 0; i < totalElements; i++ {
+	for i := range totalElements {
 		// Get an element, by index. This is an interface{} and is expected to be a GStatic or a GTransition
 		eInterface, err := gtw.Config.Get(i)
 		if err != nil {
@@ -70,7 +70,7 @@ func GnomeToSimpleString(gtw *Wallpaper) (string, error) {
 	sb.WriteString("format: " + commonPrefix + "%s" + commonSuffix + "\n")
 
 	// Then output the timing information, for static images and for transitions
-	for i := 0; i < totalElements; i++ {
+	for i := range totalElements {
 		// The duration of the event is specified in the XML file, but not when it should start
 
 		// Get an element, by index. This is an interface{} and is expected to be a GStatic or a GTransition
diff --git a/pkg/gnometimed/eventloop.go b/pkg/gnometimed/eventloop.go
@@ -72,7 +72,7 @@ func (gtw *Wallpaper) EventLoop(verbose bool, setWallpaperFunc func(string) erro
 	// Keep track of the total time. It is increased every time a new element duration is encountered.
 	eventTime := startTime
 
-	for i := 0; i < totalElements; i++ {
+	for i := range totalElements {
 		// The duration of the event is specified in the XML file, but not when it should start
 
 		// Get an element, by index. This is an interface{} and is expected to be a GStatic or a GTransition
diff --git a/pkg/gnometimed/timedxml.go b/pkg/gnometimed/timedxml.go
@@ -105,7 +105,7 @@ func (gb *GBackground) StaticOrder(i int) (int, error) {
 
 // Get either a GStatic or a GTransition, given a total position.
 // Will return nil and an error if nothing is found.
-func (gb *GBackground) Get(i int) (interface{}, error) {
+func (gb *GBackground) Get(i int) (any, error) {
 	for k, v := range gb.staticOrder {
 		if v == i {
 			// Found it
@@ -156,7 +156,7 @@ func findOrder(XMLData []byte) (StaticMap, TransitionMap, error) {
 	// create a simple map of increasing indexes and exit early
 	if transitionCount == 0 {
 		// No transition tags, only static tags
-		for i := 0; i < staticCount; i++ {
+		for i := range staticCount {
 			staticOrder[i] = i
 		}
 		return staticOrder, transitionOrder, nil
diff --git a/pkg/gnometimed/utils.go b/pkg/gnometimed/utils.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 )
@@ -47,12 +48,7 @@ func dFmt(d time.Duration) string {
 
 // has checks if a string slice has the given element
 func has(sl []string, e string) bool {
-	for _, s := range sl {
-		if s == e {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(sl, e)
 }
 
 // unique removes all repeated elements from a slice of strings
diff --git a/pkg/simpletimed/eventloop.go b/pkg/simpletimed/eventloop.go
@@ -54,9 +54,9 @@ func (stw *Wallpaper) UntilNext(et time.Time) (time.Duration, time.Time) {
 
 // NextEvent finds the next event, given a timestamp.
 // Returns an interface{} that is either a static or transition event.
-func (stw *Wallpaper) NextEvent(et time.Time) (interface{}, time.Time, error) {
+func (stw *Wallpaper) NextEvent(et time.Time) (any, time.Time, error) {
 	// Create a map, from timestamps to wallpaper events
-	events := make(map[time.Time]interface{})
+	events := make(map[time.Time]any)
 	for _, t := range stw.Transitions {
 		events[t.From] = t
 	}
@@ -68,7 +68,7 @@ func (stw *Wallpaper) NextEvent(et time.Time) (interface{}, time.Time, error) {
 	}
 
 	// Using all the collected hours&minutes, create a list of times both today and tomorrow that uses those hours&minutes
-	allTimes := make(map[time.Time]interface{})
+	allTimes := make(map[time.Time]any)
 	now := time.Now()
 	for t, e := range events {
 		today := time.Date(now.Year(), now.Month(), now.Day(), t.Hour(), t.Minute(), 0, 0, now.Location())
@@ -80,7 +80,7 @@ func (stw *Wallpaper) NextEvent(et time.Time) (interface{}, time.Time, error) {
 	// Now we have all possible start times, now to find the ones that are both positive and smallest
 	mindiff := h24
 	when := now
-	var eventHappening interface{}
+	var eventHappening any
 	for t, e := range allTimes {
 		if eventHappening == nil {
 			eventHappening = e
@@ -98,9 +98,9 @@ func (stw *Wallpaper) NextEvent(et time.Time) (interface{}, time.Time, error) {
 
 // PrevEvent finds the previous event, given a timestamp.
 // Returns an interface{} that is either a static or transition event.
-func (stw *Wallpaper) PrevEvent(et time.Time) (interface{}, time.Time, error) {
+func (stw *Wallpaper) PrevEvent(et time.Time) (any, time.Time, error) {
 	// Create a map, from timestamps to wallpaper events
-	events := make(map[time.Time]interface{})
+	events := make(map[time.Time]any)
 	for _, t := range stw.Transitions {
 		events[t.From] = t
 	}
@@ -111,7 +111,7 @@ func (stw *Wallpaper) PrevEvent(et time.Time) (interface{}, time.Time, error) {
 		return nil, et, errors.New("can not find next event: got no events")
 	}
 	// Using all the collected hours&minutes, create a list of times both today and tomorrow that uses those hours&minutes
-	allTimes := make(map[time.Time]interface{})
+	allTimes := make(map[time.Time]any)
 	now := time.Now()
 	for t, e := range events {
 		today := time.Date(now.Year(), now.Month(), now.Day(), t.Hour(), t.Minute(), 0, 0, now.Location())
@@ -125,7 +125,7 @@ func (stw *Wallpaper) PrevEvent(et time.Time) (interface{}, time.Time, error) {
 
 	mindiff := h24
 	when := now
-	var eventHappening interface{}
+	var eventHappening any
 	for t, e := range allTimes {
 		if eventHappening == nil {
 			eventHappening = e
diff --git a/proc.go b/proc.go
@@ -3,6 +3,7 @@ package wallutils
 import (
 	"os"
 	"os/exec"
+	"slices"
 	"strings"
 )
 
@@ -46,10 +47,8 @@ func checkProcFSForArgs(command, args string) (bool, error) {
 		}
 		// Check if it's the target command with the specified args
 		if strings.Contains(cmdArgs[0], command) {
-			for _, arg := range cmdArgs[1:] {
-				if arg == args {
-					return true, nil
-				}
+			if slices.Contains(cmdArgs[1:], args) {
+				return true, nil
 			}
 		}
 	}
diff --git a/sway.go b/sway.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package wallutils
 
diff --git a/swaybg.go b/swaybg.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package wallutils
 
diff --git a/utils.go b/utils.go
@@ -5,24 +5,15 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strings"
 )
 
-// has checks if a string slice has the given element
-func hasS(xs []string, x string) bool {
-	for _, e := range xs {
-		if e == x {
-			return true
-		}
-	}
-	return false
-}
-
 // unique removes all repeated elements from a slice of strings
 func unique(sl []string) []string {
 	var nl []string
 	for _, s := range sl {
-		if !hasS(nl, s) {
+		if !slices.Contains(nl, s) {
 			nl = append(nl, s)
 		}
 	}
diff --git a/xrandr.go b/xrandr.go
@@ -48,7 +48,7 @@ func (x *XRandr) CheckOverlap() {
 	}
 	xrandrOutput := output("xrandr", []string{}, x.verbose)
 	rects := make([]image.Rectangle, 0)
-	for _, line := range strings.Split(xrandrOutput, "\n") {
+	for line := range strings.SplitSeq(xrandrOutput, "\n") {
 		words := strings.Fields(line)
 		if len(words) < 3 {
 			continue

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build cgo`
`2`		`-// +build cgo`
`3`	`2`
`4`	`3`	`package wallutils`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !cgo`
`2`		`-// +build !cgo`
`3`	`2`
`4`	`3`	`package wallutils`
`5`	`4`