Run gofumpt on the project

backend/config.go

@@ -317,7 +317,7 @@ func (c *Config) WriteConfigFile(filepath string) error {
 	if err != nil {
 		return err
 	}
-	os.WriteFile(filepath, b, 0644)
+	os.WriteFile(filepath, b, 0o644)
 
 	return nil
 }

backend/imagecache.go

@@ -39,9 +39,7 @@ type ImageCache struct {
 	cache map[string]CacheItem
 }
 
-var (
+var ErrNotFound = errors.New("item not found")
-	ErrNotFound = errors.New("item not found")
-)
 
 func (i *ImageCache) Init(ctx context.Context, evictionInterval time.Duration) {
 	i.cache = make(map[string]CacheItem)
@@ -238,5 +236,4 @@ func (i *ImageCache) EvictExpired() {
 			delete(i.cache, key)
 		}
 	}
-
 }

backend/ipc/client.go

@@ -130,7 +130,6 @@ func (c *Client) Quit() error {
 
 func (c *Client) sendRequest(path string) (string, error) {
 	resp, err := c.httpC.Get("http://supersonic/" + path)
-
 	if err != nil {
 		return "", err
 	}

backend/mediaprovider/jellyfin/jellyfinmediaprovider.go

@@ -438,7 +438,7 @@ func toTrack(ch *jellyfin.Song) *mediaprovider.Track {
 		Duration:    time.Duration(ch.RunTimeTicks/runTimeTicksPerMicrosecond) * time.Microsecond,
 		TrackNumber: ch.IndexNumber,
 		DiscNumber:  ch.DiscNumber,
-		//Genre:       ch.Genres,
+		// Genre:       ch.Genres,
 		ArtistIDs:   artistIDs,
 		ArtistNames: artistNames,
 		Album:       ch.Album,

backend/mediaprovider/mediaprovider.go

@@ -32,9 +32,11 @@ type MediaIterator[M any] interface {
 	Next() *M
 }
 
-type ArtistIterator = MediaIterator[Artist]
+type (
-type AlbumIterator = MediaIterator[Album]
+	ArtistIterator = MediaIterator[Artist]
-type TrackIterator = MediaIterator[Track]
+	AlbumIterator  = MediaIterator[Album]
+	TrackIterator  = MediaIterator[Track]
+)
 
 type MediaFilter[M, F any] interface {
 	Options() F

backend/mediaprovider/subsonic/subsonicmediaprovider.go

@@ -298,7 +298,8 @@ func (s *subsonicMediaProvider) ClientDecidesScrobble() bool { return true }
 func (s *subsonicMediaProvider) TrackBeganPlayback(trackID string) error {
 	return s.client.Scrobble(trackID, map[string]string{
 		"time":       strconv.FormatInt(time.Now().UnixMilli(), 10),
-		"submission": "false"})
+		"submission": "false",
+	})
 }
 
 func (s *subsonicMediaProvider) TrackEndedPlayback(trackID string, _ int, submission bool) error {
@@ -307,7 +308,8 @@ func (s *subsonicMediaProvider) TrackEndedPlayback(trackID string, _ int, submis
 	}
 	return s.client.Scrobble(trackID, map[string]string{
 		"time":       strconv.FormatInt(time.Now().UnixMilli(), 10),
-		"submission": "true"})
+		"submission": "true",
+	})
 }
 
 func (s *subsonicMediaProvider) SetFavorite(params mediaprovider.RatingFavoriteParameters, favorite bool) error {

backend/mpris.go

@@ -24,9 +24,7 @@ var (
 	_ types.OrgMprisMediaPlayer2PlayerAdapterLoopStatus = (*MPRISHandler)(nil)
 )
 
-var (
+var errNotSupported = errors.New("not supported")
-	errNotSupported = errors.New("not supported")
-)
 
 type MPRISHandler struct {
 	// Function called if the player is requested to quit through MPRIS.

backend/player/jukebox/jukeboxplayer.go

@@ -109,7 +109,6 @@ func (j *JukeboxPlayer) SetNextTrack(track *mediaprovider.Track) error {
 	}
 	j.queueLength += 1
 	return nil
-
 }
 
 func (j *JukeboxPlayer) SeekSeconds(secs float64) error {

backend/player/mpv/peaks.go

@@ -3,6 +3,7 @@ package mpv
 // #include <mpv/client.h>
 // int mpv_get_peaks(mpv_handle* handle, double* lPeak, double* rPeak, double* lRMS, double* rRMS);
 import "C"
+
 import (
 	"github.com/supersonic-app/go-mpv"
 )

backend/player/mpv/player.go

@@ -492,7 +492,7 @@ func (p *Player) eventHandler(ctx context.Context) {
 		default:
 			e := p.mpv.WaitEvent(1 /*timeout seconds*/)
 			if e.Event_Id != mpv.EVENT_NONE {
-				//log.Printf("mpv event: %+v\n", e)
+				// log.Printf("mpv event: %+v\n", e)
 			}
 			switch e.Event_Id {
 			case mpv.EVENT_PLAYBACK_RESTART:

backend/savedplayqueue.go

@@ -51,7 +51,7 @@ func SavePlayQueue(serverID string, pm *PlaybackManager, filepath string, server
 		TimePos:    stats.TimePos,
 	}
 	b, _ := json.Marshal(saved)
-	err := os.WriteFile(filepath, b, 0644)
+	err := os.WriteFile(filepath, b, 0o644)
 
 	if server != nil {
 		// save to server

backend/waveformimage.go

@@ -308,7 +308,7 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat
 			currentSize := stat.Size()
 
 			// how many bytes can we read without nearing EOF
-			readableBytes := currentSize - int64(samplesPerChunk)*int64(curChunk)*bytesPerSample - 8192 //buffer for safety
+			readableBytes := currentSize - int64(samplesPerChunk)*int64(curChunk)*bytesPerSample - 8192 // buffer for safety
 
 			// Estimate how many samples we can read
 			maxSamples := int(readableBytes / bytesPerSample)
@@ -391,7 +391,7 @@ func computePeakAndRMS(chunk []float64) (peak float64, rms float64) {
 		sumSquares += float64(v * v)
 	}
 	rms = math.Sqrt(sumSquares / float64(len(chunk)))
-	return
+	return peak, rms
 }
 
 func float64ToByte(val float64) byte {

backend/windows/smtc.go

@@ -17,8 +17,10 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-type SMTCPlaybackState int
+type (
-type SMTCButton int
+	SMTCPlaybackState int
+	SMTCButton        int
+)
 
 const (
 	// constants from smtc.h in github.com/supersonic-app/smtc-dll

backend/windows/smtc_unsupported.go

@@ -4,8 +4,10 @@ package windows
 
 import "errors"
 
-type SMTCPlaybackState int
+type (
-type SMTCButton int
+	SMTCPlaybackState int
+	SMTCButton        int
+)
 
 const (
 	// constants from smtc.h in github.com/supersonic-app/smtc-dll

backend/windows/taskbar_buttons.go

@@ -10,6 +10,7 @@ package windows
 extern void goButtonClicked(int);
 */
 import "C"
+
 import (
 	"errors"
 	"image"

sharedutil/sharedutil_test.go

@@ -8,7 +8,6 @@ import (
 )
 
 func Test_ReorderItems(t *testing.T) {
-
 	tracks := []*mediaprovider.Track{
 		{ID: "a"}, // 0
 		{ID: "b"}, // 1

ui/browsing/artistpage.go

@@ -486,7 +486,7 @@ type ArtistPageHeader struct {
 	menuBtn               *widget.Button
 	container             *fyne.Container
 	fullSizeCoverFetching bool
-	//shareMenuItem  *fyne.MenuItem
+	// shareMenuItem  *fyne.MenuItem
 }
 
 func NewArtistPageHeader(page *ArtistPage) *ArtistPageHeader {

ui/browsing/genrespage.go

@@ -204,7 +204,8 @@ func NewGenreList(sorting widgets.ListHeaderSort) *GenreList {
 	a.hdr = widgets.NewListHeader([]widgets.ListColumn{
 		{Text: lang.L("Name"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
 		{Text: albumCount, Alignment: fyne.TextAlignTrailing, CanToggleVisible: false},
-		{Text: trackCount, Alignment: fyne.TextAlignTrailing, CanToggleVisible: false}},
+		{Text: trackCount, Alignment: fyne.TextAlignTrailing, CanToggleVisible: false},
+	},
 		a.columnsLayout)
 	a.hdr.SetSorting(sorting)
 	a.hdr.OnColumnSortChanged = a.onSorted
@@ -261,7 +262,7 @@ func (g *GenreList) doSortGenres() {
 		return
 	}
 	switch g.sorting.ColNumber {
-	case 0: //Name
+	case 0: // Name
 		g.stringSort(func(g *mediaprovider.Genre) string { return g.Name })
 	case 1: // Album Count
 		g.intSort(func(g *mediaprovider.Genre) int { return g.AlbumCount })

ui/browsing/nowplayingpage.go

@@ -360,8 +360,10 @@ func (a *NowPlayingPage) updateLyrics() {
 	// set the widget to an empty (not nil) lyric during fetch
 	// to keep it from showing "Lyrics not available"
 	a.lyricsViewer.DisableTapToSeek()
-	a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{Synced: true,
+	a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{
-		Lines: []mediaprovider.LyricLine{{Text: ""}}})
+		Synced: true,
+		Lines:  []mediaprovider.LyricLine{{Text: ""}},
+	})
 	tr, _ := a.nowPlaying.(*mediaprovider.Track)
 	go a.fetchLyrics(ctx, tr)
 }
@@ -482,7 +484,6 @@ func (a *NowPlayingPage) OnPlayTimeUpdate(curTime, _ float64, seeked bool) {
 
 func (a *NowPlayingPage) currentTracklistOrNil() *widgets.PlayQueueList {
 	if a.tabs != nil {
-
 		switch a.tabs.SelectedIndex() {
 		case 0: /*queue*/
 			return a.queueList

ui/browsing/playlistspage.go

@@ -389,7 +389,8 @@ func (p *PlaylistList) buildHeaderAndLayout() {
 		{Text: lang.L("Name"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
 		{Text: lang.L("_Description"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
 		{Text: lang.L("Owner"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
-		{Text: trackCount, Alignment: fyne.TextAlignTrailing, CanToggleVisible: false}}, p.columnsLayout)
+		{Text: trackCount, Alignment: fyne.TextAlignTrailing, CanToggleVisible: false},
+	}, p.columnsLayout)
 	p.header.SetSorting(p.sorting)
 	p.header.OnColumnSortChanged = p.onSorted
 }
@@ -422,7 +423,7 @@ func (p *PlaylistList) doSortPlaylists() {
 		return
 	}
 	switch p.sorting.ColNumber {
-	case 0: //Name
+	case 0: // Name
 		p.stringSort(func(p *mediaprovider.Playlist) string { return p.Name })
 	case 1: // Description
 		p.stringSort(func(p *mediaprovider.Playlist) string { return p.Description })

ui/browsing/radiospage.go

@@ -253,7 +253,8 @@ func NewRadioList(nowPlayingIDPtr *string) *RadioList {
 	a.ExtendBaseWidget(a)
 	a.hdr = widgets.NewListHeader([]widgets.ListColumn{
 		{Text: lang.L("Name"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
-		{Text: lang.L("Home Page"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false}},
+		{Text: lang.L("Home Page"), Alignment: fyne.TextAlignLeading, CanToggleVisible: false},
+	},
 		a.columnsLayout)
 	a.hdr.DisableSorting = true
 	a.list = widgets.NewFocusList(
@@ -299,8 +300,7 @@ func NewRadioList(nowPlayingIDPtr *string) *RadioList {
 				row.IsPlaying = isPlaying
 				row.nameLabel.Segments[0].(*widget.TextSegment).Style.TextStyle.Bold = isPlaying
 				if isPlaying {
-					row.Content.(*fyne.Container).Objects[0] =
+					row.Content.(*fyne.Container).Objects[0] = container.NewBorder(nil, nil, a.playingIcon, nil,
-						container.NewBorder(nil, nil, a.playingIcon, nil,
 						container.New(layout.NewCustomPaddedLayout(0, 0, -5, 0), row.nameLabel))
 				} else {
 					row.Content.(*fyne.Container).Objects[0] = row.nameLabel

ui/controller/controller.go

@@ -309,7 +309,6 @@ func (c *Controller) ShowAboutDialog() {
 }
 
 func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map[string]string) {
-
 	devs, err := c.App.LocalPlayer.ListAudioDevices()
 	if err != nil {
 		log.Printf("error listing audio devices: %v", err)
@@ -358,7 +357,6 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map
 	c.ClosePopUpOnEscape(pop)
 	c.haveModal = true
 	pop.Show()
-
 }
 
 func (c *Controller) doModalClosed() {
@@ -467,7 +465,6 @@ func (c *Controller) ShowDownloadDialog(tracks []*mediaprovider.Track, downloadN
 			} else {
 				go c.downloadTracks(tracks, file.URI().Path(), downloadName)
 			}
-
 		},
 		c.MainWindow)
 	dg.SetFileName(fileName)

ui/controller/playlist.go

@@ -88,7 +88,6 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
 				}()
 			}
 		}
-
 	})
 	m.ClosePopUpOnEscape(pop)
 	m.haveModal = true

ui/controller/routes.go

@@ -81,6 +81,7 @@ func GenresRoute() Route {
 func PlaylistRoute(id string) Route {
 	return Route{Page: Playlist, Arg: id}
 }
+
 func PlaylistsRoute() Route {
 	return Route{Page: Playlists}
 }

ui/controller/serverconnection.go

@@ -200,7 +200,6 @@ func (m *Controller) PromptForLoginAndConnect() {
 					pop.Show()
 				}
 			}, m.MainWindow)
-
 	}
 	m.haveModal = true
 	pop.Show()

ui/dialogs/searchdialog.go

@@ -374,5 +374,4 @@ func (q *searchEntry) TypedKey(e *fyne.KeyEvent) {
 	default:
 		q.SearchEntry.TypedKey(e)
 	}
-
 }

ui/dialogs/settingsdialog.go

@@ -488,7 +488,8 @@ func (s *SettingsDialog) createAppearanceTab(window fyne.Window) *container.TabI
 	themeModeSelect := widget.NewSelect([]string{
 		string(myTheme.AppearanceDark),
 		string(myTheme.AppearanceLight),
-		string(myTheme.AppearanceAuto)}, nil)
+		string(myTheme.AppearanceAuto),
+	}, nil)
 	themeModeSelect.OnChanged = func(_ string) {
 		s.config.Theme.Appearance = themeModeSelect.Options[themeModeSelect.SelectedIndex()]
 		if s.OnThemeSettingChanged != nil {

ui/shortcuts/shortcuts.go

@@ -20,6 +20,8 @@ var (
 	ShortcutNavSeven = desktop.CustomShortcut{KeyName: fyne.Key7, Modifier: fyne.KeyModifierShortcutDefault}
 	ShortcutNavEight = desktop.CustomShortcut{KeyName: fyne.Key8, Modifier: fyne.KeyModifierShortcutDefault}
 
-	NavShortcuts = []desktop.CustomShortcut{ShortcutNavOne, ShortcutNavTwo, ShortcutNavThree,
+	NavShortcuts = []desktop.CustomShortcut{
-		ShortcutNavFour, ShortcutNavFive, ShortcutNavSix, ShortcutNavSeven, ShortcutNavEight}
+		ShortcutNavOne, ShortcutNavTwo, ShortcutNavThree,
+		ShortcutNavFour, ShortcutNavFive, ShortcutNavSix, ShortcutNavSeven, ShortcutNavEight,
+	}
 )

ui/toastoverlay.go

@@ -89,7 +89,6 @@ func (t *ToastOverlay) makeToastAnimFunc(endPos fyne.Position, dismissal bool) f
 				t.cancelPreviousToast()
 			}
 		}
-
 	}
 }
 

ui/util/svg.go

@@ -225,7 +225,7 @@ func colorToHexAndOpacity(color color.Color) (hexStr, aStr string) {
 	r, g, b, a := toNRGBA(color)
 	cBytes := []byte{byte(r), byte(g), byte(b)}
 	hexStr, aStr = "#"+hex.EncodeToString(cBytes), strconv.FormatFloat(float64(a)/0xff, 'f', 6, 64)
-	return
+	return hexStr, aStr
 }
 
 // toNRGBA converts a color to RGBA values which are not premultiplied, unlike color.RGBA().
@@ -300,7 +300,7 @@ func toNRGBA(c color.Color) (r, g, b, a int) {
 	default: // RGBA, RGBA64, and unknown implementations of Color
 		r, g, b, a = unmultiplyAlpha(c)
 	}
-	return
+	return r, g, b, a
 }
 
 // unmultiplyAlpha returns a color's RGBA components as 8-bit integers by calling c.RGBA() and then removing the alpha premultiplication.
@@ -317,5 +317,5 @@ func unmultiplyAlpha(c color.Color) (r, g, b, a int) {
 	g = int(green >> 8)
 	b = int(blue >> 8)
 	a = int(alpha >> 8)
-	return
+	return r, g, b, a
 }

ui/util/util.go

@@ -55,7 +55,7 @@ func dateFormatForLocale(locale string) DateFormat {
 }
 
 func shortMonthName(month int) string {
-	var months = [12]string{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}
+	months := [12]string{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}
 	if month >= 1 && month <= 12 {
 		return lang.L(months[month-1])
 	}

ui/visualizations/peakmeter.go

@@ -210,7 +210,7 @@ func (l *peakMeterRenderer) Refresh() {
 
 func (l *peakMeterRenderer) Objects() []fyne.CanvasObject {
 	if l.objects == nil {
-		l.objects = make([]fyne.CanvasObject, 0, 2*len(l.rulerLines) + 8)
+		l.objects = make([]fyne.CanvasObject, 0, 2*len(l.rulerLines)+8)
 		for i := range l.rulerLines {
 			l.objects = append(l.objects, &l.rulerLines[i], &l.rulerLabels[i])
 		}

ui/widgets/auxcontrols.go

@@ -49,7 +49,7 @@ func NewAuxControls(initialVolume int, initialLoopMode backend.LoopMode, initial
 	a.cast.SetToolTip(lang.L("Cast to device"))
 
 	a.autoplay.Highlighted = initialAutoplay
-	//a.autoplay.IconSize = IconButtonSizeSmaller
+	// a.autoplay.IconSize = IconButtonSizeSmaller
 	a.autoplay.SetToolTip(lang.L("Autoplay"))
 	a.autoplay.OnTapped = func() {
 		a.SetAutoplay(!a.autoplay.Highlighted)

ui/widgets/focuslist.go

@@ -71,10 +71,12 @@ func (g *FocusList) FocusNeighbor(curItem widget.ListItemID, up bool) {
 	}
 }
 
-var _ fyne.Tappable = (*FocusListRowBase)(nil)
+var (
-var _ fyne.Widget = (*FocusListRowBase)(nil)
+	_ fyne.Tappable     = (*FocusListRowBase)(nil)
-var _ fyne.Focusable = (*FocusListRowBase)(nil)
+	_ fyne.Widget       = (*FocusListRowBase)(nil)
-var _ desktop.Hoverable = (*FocusListRowBase)(nil)
+	_ fyne.Focusable    = (*FocusListRowBase)(nil)
+	_ desktop.Hoverable = (*FocusListRowBase)(nil)
+)
 
 // Base type used for all list rows in widgets such as Tracklist, etc.
 type FocusListRowBase struct {
@@ -88,7 +90,7 @@ type FocusListRowBase struct {
 
 	OnTapped        func()
 	OnDoubleTapped  func()
-	OnFocusNeighbor func(up bool) //TODO: func(up, selecting bool)
+	OnFocusNeighbor func(up bool) // TODO: func(up, selecting bool)
 
 	tappedAt      int64 // unixMillis
 	focusedRect   canvas.Rectangle

ui/widgets/gridviewitem.go

@@ -21,8 +21,10 @@ import (
 	"github.com/dweymouth/supersonic/ui/util"
 )
 
-var _ fyne.Widget = (*GridViewItem)(nil)
+var (
-var _ fyne.Focusable = (*GridViewItem)(nil)
+	_ fyne.Widget    = (*GridViewItem)(nil)
+	_ fyne.Focusable = (*GridViewItem)(nil)
+)
 
 var _ fyne.Widget = (*coverImage)(nil)
 

ui/widgets/loadingdots.go

@@ -28,8 +28,10 @@ type LoadingDots struct {
 func NewLoadingDots() *LoadingDots {
 	l := &LoadingDots{}
 	for i := range l.dots {
-		l.dots[i] = minSizeCircle{Circle: canvas.Circle{
+		l.dots[i] = minSizeCircle{
-			FillColor: theme.DisabledColor()},
+			Circle: canvas.Circle{
+				FillColor: theme.DisabledColor(),
+			},
 		}
 	}
 	l.ExtendBaseWidget(l)

ui/widgets/multihyperlink.go

@@ -31,7 +31,7 @@ type MultiHyperlink struct {
 
 	// TODO: Once https://github.com/fyne-io/fyne/issues/4336 is resolved,
 	//   we can switch to the much cleaner RichText implementation
-	//provider *widget.RichText
+	// provider *widget.RichText
 
 	objects     []fyne.CanvasObject
 	suffixLabel *ttwidget.RichText
@@ -45,11 +45,11 @@ type MultiHyperlinkSegment struct {
 
 func NewMultiHyperlink() *MultiHyperlink {
 	c := &MultiHyperlink{
-		//provider: widget.NewRichText(),
+		// provider: widget.NewRichText(),
 		content: container.NewWithoutLayout(),
 	}
 	c.ExtendBaseWidget(c)
-	//c.provider.Truncation = fyne.TextTruncateEllipsis
+	// c.provider.Truncation = fyne.TextTruncateEllipsis
 	return c
 }
 
@@ -302,12 +302,12 @@ func (c *MultiHyperlink) Resize(size fyne.Size) {
 }
 
 func (c *MultiHyperlink) Refresh() {
-	//c.syncSegments()
+	// c.syncSegments()
 	c.layoutObjects()
 	c.BaseWidget.Refresh()
 }
 
 func (c *MultiHyperlink) CreateRenderer() fyne.WidgetRenderer {
 	return widget.NewSimpleRenderer(c.content)
-	//return widget.NewSimpleRenderer(c.provider)
+	// return widget.NewSimpleRenderer(c.provider)
 }

ui/widgets/playqueuelist.go

@@ -264,7 +264,6 @@ func (p *PlayQueueList) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
 		p.ensureRadiosMenu()
 		p.radiosMenu.ShowAtPosition(e.AbsolutePosition)
 	}
-
 }
 
 func (p *PlayQueueList) ensureTracksMenu() {

ui/widgets/starrating.go

@@ -103,7 +103,7 @@ var _ fyne.Tappable = (*StarRating)(nil)
 
 func (s *StarRating) Tapped(*fyne.PointEvent) {
 	if s.mouseHoverRating <= 0 {
-		return //shouldn't happen
+		return // shouldn't happen
 	}
 	if s.Rating == s.mouseHoverRating {
 		s.Rating = 0

ui/widgets/tracklistrow.go

@@ -352,6 +352,7 @@ func (t *tracklistRowBase) create(tracklist *Tracklist) {
 func (t *tracklistRowBase) SetOnTappedSecondary(f func(*fyne.PointEvent, int)) {
 	t.OnTappedSecondary = f
 }
+
 func (t *tracklistRowBase) TrackID() string {
 	return t.trackID
 }