owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #719 from Jacalz/modernise

Browse Source 
Run modernise on the project
This commit is contained in:
Drew Weymouth
2025-09-18 10:31:19 -07:00
committed by GitHub
parent ee742cf34e ebc5b7e039
commit bf39a9e179
53 changed files with 133 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/cmdlineoptions.go
+1 -3
View File
@@ -58,9 +58,7 @@ func init() {
return err
})
flag.Func("volume-adjust-pct", "adjusts volume up or down by the given percentage (positive or negative)", func(s string) error {
if strings.HasSuffix(s, "%") {
s = s[:len(s)-1]
}
s = strings.TrimSuffix(s, "%")
v, err := strconv.ParseFloat(s, 64)
VolumePctCLIArg = v
return err
backend/config.go
+1 -1
View File
@@ -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
+1 -4
View File
@@ -39,9 +39,7 @@ type ImageCache struct {
cache map[string]CacheItem
}
var (
ErrNotFound = errors.New("item not found")
)
var 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/imagemanager.go
+2 -2
View File
@@ -46,7 +46,7 @@ type ImageManager struct {
maxOnDiskCacheSizeBytes int64
filesWrittenSinceLastPrune bool
serverFetchSema chan interface{}
serverFetchSema chan any
}
// NewImageManager returns a new ImageManager.
@@ -64,7 +64,7 @@ func NewImageManager(ctx context.Context, s *ServerManager, baseCacheDir string)
DefaultTTL: 1 * time.Minute,
},
maxOnDiskCacheSizeBytes: defaultDiskCacheSizeBytes,
serverFetchSema: make(chan interface{}, maxConcurrentServerFetches),
serverFetchSema: make(chan any, maxConcurrentServerFetches),
}
s.OnLogout(func() {
i.thumbnailCache.Clear()
backend/ipc/client.go
-1
View File
@@ -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/ipc/server.go
+1 -1
View File
@@ -144,7 +144,7 @@ func (s *serverImpl) createHandler() http.Handler {
search = strings.ToLower(search)
filtered := make([]mediaprovider.Playlist, 0)
for i := 0; i < len(all); i++ {
for i := range all {
playlist := all[i]
name := strings.ReplaceAll(playlist.Name, " ", "")
name = strings.ToLower(name)
backend/mediaprovider/jellyfin/jellyfinmediaprovider.go
+2 -2
View File
@@ -344,7 +344,7 @@ func (j *jellyfinMediaProvider) SetFavorite(params mediaprovider.RatingFavoriteP
}
numBatches := int(math.Ceil(float64(len(allIDs)) / float64(batchSize)))
for i := 0; i < numBatches; i++ {
for i := range numBatches {
var wg sync.WaitGroup
batchSetFavorite(i*batchSize, &wg)
wg.Wait()
@@ -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
+5 -3
View File
@@ -32,9 +32,11 @@ type MediaIterator[M any] interface {
Next() *M
}
type ArtistIterator = MediaIterator[Artist]
type AlbumIterator = MediaIterator[Album]
type TrackIterator = MediaIterator[Track]
type (
ArtistIterator = MediaIterator[Artist]
AlbumIterator = MediaIterator[Album]
TrackIterator = MediaIterator[Track]
)
type MediaFilter[M, F any] interface {
Options() F
backend/mediaprovider/subsonic/artistiterator.go
+3 -8
View File
@@ -22,11 +22,8 @@ func (s *subsonicMediaProvider) ArtistSortOrders() []string {
}
}
func filterArtistMatches(f mediaprovider.ArtistFilter, artist *subsonic.ArtistID3) bool {
if artist == nil {
return false
}
return true
func filterArtistMatches(_ mediaprovider.ArtistFilter, artist *subsonic.ArtistID3) bool {
return artist != nil
}
func (s *subsonicMediaProvider) IterateArtists(sortOrder string, filter mediaprovider.ArtistFilter) mediaprovider.ArtistIterator {
@@ -176,9 +173,7 @@ func (s *subsonicMediaProvider) artistFetchFnFromStandardSort(sortFn func([]*sub
}
var artists []*subsonic.ArtistID3
for _, idx := range idxs.Index {
for _, ar := range idx.Artist {
artists = append(artists, ar)
}
artists = append(artists, idx.Artist...)
}
artists = sortFn(artists)
return artists, nil
backend/mediaprovider/subsonic/subsonicmediaprovider.go
+5 -3
View File
@@ -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 {
@@ -342,7 +344,7 @@ func (s *subsonicMediaProvider) SetRating(params mediaprovider.RatingFavoritePar
}
numBatches := int(math.Ceil(float64(len(params.TrackIDs)) / float64(batchSize)))
for i := 0; i < numBatches; i++ {
for i := range numBatches {
var wg sync.WaitGroup
batchSetRating(i*batchSize, &wg)
wg.Wait()
backend/mpris.go
+1 -3
View File
@@ -24,9 +24,7 @@ var (
_ types.OrgMprisMediaPlayer2PlayerAdapterLoopStatus = (*MPRISHandler)(nil)
)
var (
errNotSupported = errors.New("not supported")
)
var errNotSupported = errors.New("not supported")
type MPRISHandler struct {
// Function called if the player is requested to quit through MPRIS.
backend/playbackmanager.go
+1 -1
View File
@@ -498,7 +498,7 @@ func (p *PlaybackManager) PlayRandomAlbums(genreName string) error {
}
iter := mp.IterateAlbums(mediaprovider.AlbumSortRandom, mediaprovider.NewAlbumFilter(options))
insertMode := Replace
for i := 0; i < 20; i++ {
for i := range 20 {
al := iter.Next()
if al == nil {
break
backend/player/dlna/dlnaplayer.go
+6 -6
View File
@@ -618,7 +618,7 @@ func (d *DLNAPlayer) lookupProxyURL(key string) (string, bool) {
d.proxyURLLock.Lock()
defer d.proxyURLLock.Unlock()
for i := 0; i < len(d.proxyURLs); i++ {
for i := range len(d.proxyURLs) {
if d.proxyURLs[i].key == key {
url := d.proxyURLs[i].url
// Move accessed entry to the most recent position
@@ -632,7 +632,7 @@ func (d *DLNAPlayer) lookupProxyURL(key string) (string, bool) {
func (d *DLNAPlayer) _updateProxyURL(key, url string) {
// Check if the key already exists, and if so, move it to the most recently used position
for i := 0; i < len(d.proxyURLs); i++ {
for i := range len(d.proxyURLs) {
if d.proxyURLs[i].key == key {
if i < len(d.proxyURLs)-1 {
// Shift elements to the left from found position to the end
@@ -652,19 +652,19 @@ func (d *DLNAPlayer) _updateProxyURL(key, url string) {
type retryLogger struct{}
func (retryLogger) Error(msg string, keysAndValues ...interface{}) {
func (retryLogger) Error(msg string, keysAndValues ...any) {
log.Println(msg, keysAndValues)
}
func (retryLogger) Info(msg string, keysAndValues ...interface{}) {
func (retryLogger) Info(msg string, keysAndValues ...any) {
log.Println(msg, keysAndValues)
}
func (retryLogger) Warn(msg string, keysAndValues ...interface{}) {
func (retryLogger) Warn(msg string, keysAndValues ...any) {
log.Println(msg, keysAndValues)
}
func (retryLogger) Debug(msg string, keysAndValues ...interface{}) {
func (retryLogger) Debug(msg string, keysAndValues ...any) {
// log only retries, not every request
if strings.Contains(msg, "retrying request") {
log.Println(msg, keysAndValues)
backend/player/jukebox/jukeboxplayer.go
-1
View File
@@ -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
+1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -86,7 +86,7 @@ func (w *WaveformImageJob) Get() *WaveformImage {
result := NewWaveformImage()
// Copy each scanline from w.img to result
for y := 0; y < height; y++ {
for y := range height {
srcOffset := w.img.PixOffset(0, y)
dstOffset := result.PixOffset(0, y)
copy(result.Pix[dstOffset:dstOffset+w.progress*4], w.img.Pix[srcOffset:srcOffset+w.progress*4])
@@ -226,7 +226,7 @@ func generateWaveformImage(ctx context.Context, data *waveformData, job *Wavefor
opaqueColor := color.NRGBA{R: 255, G: 255, B: 255, A: 255}
translucentColor := color.NRGBA{R: 255, G: 255, B: 255, A: 128}
for x := 0; x < 1024; x++ {
for x := range 1024 {
for data.progress <= x {
if data.done {
return
@@ -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)
@@ -341,7 +341,7 @@ func analyzeWavFile(ctx context.Context, transcodeFile string, data *waveformDat
}
// Process samples
for i := 0; i < n; i++ {
for i := range n {
sample := float64(buf.Data[i]) / float64(1<<15) // Normalize to [-1, 1]
chunkSamples = append(chunkSamples, sample)
@@ -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
+4 -2
View File
@@ -17,8 +17,10 @@ import (
"golang.org/x/sys/windows"
)
type SMTCPlaybackState int
type SMTCButton int
type (
SMTCPlaybackState int
SMTCButton int
)
const (
// constants from smtc.h in github.com/supersonic-app/smtc-dll
backend/windows/smtc_unsupported.go
+11 -9
View File
@@ -4,8 +4,10 @@ package windows
import "errors"
type SMTCPlaybackState int
type SMTCButton int
type (
SMTCPlaybackState int
SMTCButton int
)
const (
// constants from smtc.h in github.com/supersonic-app/smtc-dll
@@ -22,18 +24,18 @@ const (
type SMTC struct{}
var smtcUnsupportedErr = errors.New("SMTC is not supported on this platformo")
var errSMTCUnsupported = errors.New("no support for SMTC on this platform")
func InitSMTCForWindow(hwnd uintptr) (*SMTC, error) {
return nil, smtcUnsupportedErr
return nil, errSMTCUnsupported
}
func (s *SMTC) SetEnabled(enabled bool) error {
return smtcUnsupportedErr
return errSMTCUnsupported
}
func (s *SMTC) SetThumbnail(filepath string) error {
return smtcUnsupportedErr
return errSMTCUnsupported
}
func (s *SMTC) OnButtonPressed(func(SMTCButton)) {}
@@ -43,13 +45,13 @@ func (s *SMTC) OnSeek(f func(millis int)) {}
func (s *SMTC) Shutdown() {}
func (s *SMTC) UpdatePlaybackState(state SMTCPlaybackState) error {
return smtcUnsupportedErr
return errSMTCUnsupported
}
func (s *SMTC) UpdateMetadata(title, artist string) error {
return smtcUnsupportedErr
return errSMTCUnsupported
}
func (s *SMTC) UpdatePosition(positionMillis, durationMillis int) error {
return smtcUnsupportedErr
return errSMTCUnsupported
}
backend/windows/taskbar_buttons.go
+1
View File
@@ -10,6 +10,7 @@ package windows
extern void goButtonClicked(int);
*/
import "C"
import (
"errors"
"image"
res/wintaskbarthumbs/embed.go
+15 -15
View File
@@ -1,15 +1,15 @@
package wintaskbarthumbs
import _ "embed"
//go:embed media_pause.png
var MediaPausePNG []byte
//go:embed media_play.png
var MediaPlayPNG []byte
//go:embed media_seek_next.png
var MediaSeekNextPNG []byte
//go:embed media_seek_previous.png
var MediaSeekPreviousPNG []byte
package wintaskbarthumbs
import _ "embed"
//go:embed media_pause.png
var MediaPausePNG []byte
//go:embed media_play.png
var MediaPlayPNG []byte
//go:embed media_seek_next.png
var MediaSeekNextPNG []byte
//go:embed media_seek_previous.png
var MediaSeekPreviousPNG []byte
sharedutil/sharedutil_test.go
-1
View File
@@ -8,7 +8,6 @@ import (
)
func Test_ReorderItems(t *testing.T) {
tracks := []*mediaprovider.Track{
{ID: "a"}, // 0
{ID: "b"}, // 1
ui/browsing/albumspage.go
+1 -4
View File
@@ -62,10 +62,7 @@ func (a *albumsPageAdapter) Route() controller.Route { return controller.AlbumsR
func (a *albumsPageAdapter) SortOrders() ([]string, int) {
orders := a.mp.AlbumSortOrders()
sortOrder := slices.Index(orders, a.cfg.SortOrder)
if sortOrder < 0 {
sortOrder = 0
}
sortOrder := max(slices.Index(orders, a.cfg.SortOrder), 0)
return util.LocalizeSlice(orders), sortOrder
}
ui/browsing/artistpage.go
+1 -1
View File
@@ -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/artistspage.go
+1 -4
View File
@@ -47,10 +47,7 @@ func (a *artistsPageAdapter) Route() controller.Route { return controller.Artist
func (a *artistsPageAdapter) SortOrders() ([]string, int) {
orders := a.mp.ArtistSortOrders()
sortOrder := slices.Index(orders, a.cfg.SortOrder)
if sortOrder < 0 {
sortOrder = 0
}
sortOrder := max(slices.Index(orders, a.cfg.SortOrder), 0)
return util.LocalizeSlice(orders), sortOrder
}
ui/browsing/genrespage.go
+3 -2
View File
@@ -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
+4 -3
View File
@@ -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,
Lines: []mediaprovider.LyricLine{{Text: ""}}})
a.lyricsViewer.SetLyrics(&mediaprovider.Lyrics{
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
+3 -2
View File
@@ -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
+4 -4
View File
@@ -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,9 +300,8 @@ 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] =
container.NewBorder(nil, nil, a.playingIcon, nil,
container.New(layout.NewCustomPaddedLayout(0, 0, -5, 0), row.nameLabel))
row.Content.(*fyne.Container).Objects[0] = 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
+2 -4
View File
@@ -2,6 +2,7 @@ package controller
import (
"archive/zip"
"errors"
"fmt"
"image"
"image/color"
@@ -309,7 +310,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 +358,6 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map
c.ClosePopUpOnEscape(pop)
c.haveModal = true
pop.Show()
}
func (c *Controller) doModalClosed() {
@@ -467,7 +466,6 @@ func (c *Controller) ShowDownloadDialog(tracks []*mediaprovider.Track, downloadN
} else {
go c.downloadTracks(tracks, file.URI().Path(), downloadName)
}
},
c.MainWindow)
dg.SetFileName(fileName)
@@ -549,7 +547,7 @@ func (c *Controller) sendNotification(title, content string) {
func (c *Controller) showError(content string) {
// TODO: display an in-app toast message instead of a dialog.
dialog.ShowError(fmt.Errorf(content), c.MainWindow)
dialog.ShowError(errors.New(content), c.MainWindow)
}
func (c *Controller) ShowAlbumInfoDialog(albumID, albumName string, albumCover image.Image) {
ui/controller/playlist.go
-1
View File
@@ -88,7 +88,6 @@ func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
}()
}
}
})
m.ClosePopUpOnEscape(pop)
m.haveModal = true
ui/controller/routes.go
+1
View File
@@ -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
-1
View File
@@ -200,7 +200,6 @@ func (m *Controller) PromptForLoginAndConnect() {
pop.Show()
}
}, m.MainWindow)
}
m.haveModal = true
pop.Show()
ui/dialogs/searchdialog.go
-1
View File
@@ -374,5 +374,4 @@ func (q *searchEntry) TypedKey(e *fyne.KeyEvent) {
default:
q.SearchEntry.TypedKey(e)
}
}
ui/dialogs/settingsdialog.go
+3 -5
View File
@@ -106,10 +106,7 @@ func (s *SettingsDialog) createGeneralTab(canSaveQueueToServer bool) *container.
startupPage = widget.NewSelect(pages, func(_ string) {
s.config.Application.StartupPage = backend.SupportedStartupPages[startupPage.SelectedIndex()]
})
initialIdx := slices.Index(backend.SupportedStartupPages, s.config.Application.StartupPage)
if initialIdx < 0 {
initialIdx = 0
}
initialIdx := max(slices.Index(backend.SupportedStartupPages, s.config.Application.StartupPage), 0)
startupPage.SetSelectedIndex(initialIdx)
if startupPage.Selected == "" {
startupPage.SetSelectedIndex(0)
@@ -491,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/layouts/columnslayout.go
+2 -2
View File
@@ -23,7 +23,7 @@ func NewColumnsLayout(widths []float32) *ColumnsLayout {
func (c *ColumnsLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
var width float32
var height float32
for i := 0; i < len(objects); i++ {
for i := range objects {
if !objects[i].Visible() {
continue
}
@@ -56,7 +56,7 @@ func (c *ColumnsLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
expandObjW := extraW / float32(expandObjCount)
var x float32
for i := 0; i < len(objects); i++ {
for i := range objects {
if !objects[i].Visible() {
continue
}
ui/shortcuts/shortcuts.go
+4 -2
View File
@@ -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,
ShortcutNavFour, ShortcutNavFive, ShortcutNavSix, ShortcutNavSeven, ShortcutNavEight}
NavShortcuts = []desktop.CustomShortcut{
ShortcutNavOne, ShortcutNavTwo, ShortcutNavThree,
ShortcutNavFour, ShortcutNavFive, ShortcutNavSix, ShortcutNavSeven, ShortcutNavEight,
}
)
ui/theme/theme.go
+1 -4
View File
@@ -341,10 +341,7 @@ func darkenColor(c color.Color, fraction float64) color.Color {
}
func brightenComponent(component uint32, fraction float64) uint32 {
brightened := component + uint32(float64(component)*fraction)
if brightened > 0xffff {
brightened = 0xffff
}
brightened := min(component+uint32(float64(component)*fraction), 0xffff)
return brightened
}
ui/toastoverlay.go
-1
View File
@@ -89,7 +89,6 @@ func (t *ToastOverlay) makeToastAnimFunc(endPos fyne.Position, dismissal bool) f
t.cancelPreviousToast()
}
}
}
}
ui/util/svg.go
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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/albumfilterbutton.go
+2 -2
View File
@@ -236,7 +236,7 @@ type GenreFilterSubsection struct {
genreList []string
onChanged func([]string)
selectedGenres map[string]interface{}
selectedGenres map[string]any
selectedGenresMutex sync.RWMutex
filterText *widget.Entry
@@ -253,7 +253,7 @@ type GenreFilterSubsection struct {
func NewGenreFilterSubsection(onChanged func([]string), initialSelectedGenres []string) *GenreFilterSubsection {
g := &GenreFilterSubsection{
onChanged: onChanged,
selectedGenres: make(map[string]interface{}),
selectedGenres: make(map[string]any),
}
g.ExtendBaseWidget(g)
ui/widgets/auxcontrols.go
+1 -1
View File
@@ -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
+7 -5
View File
@@ -71,10 +71,12 @@ func (g *FocusList) FocusNeighbor(curItem widget.ListItemID, up bool) {
}
}
var _ fyne.Tappable = (*FocusListRowBase)(nil)
var _ fyne.Widget = (*FocusListRowBase)(nil)
var _ fyne.Focusable = (*FocusListRowBase)(nil)
var _ desktop.Hoverable = (*FocusListRowBase)(nil)
var (
_ fyne.Tappable = (*FocusListRowBase)(nil)
_ fyne.Widget = (*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
+6 -5
View File
@@ -21,8 +21,10 @@ import (
"github.com/dweymouth/supersonic/ui/util"
)
var _ fyne.Widget = (*GridViewItem)(nil)
var _ fyne.Focusable = (*GridViewItem)(nil)
var (
_ fyne.Widget = (*GridViewItem)(nil)
_ fyne.Focusable = (*GridViewItem)(nil)
)
var _ fyne.Widget = (*coverImage)(nil)
@@ -376,11 +378,10 @@ func setPlayBtnTranslucency(f float32) {
// get theme Primary color as color.NRGBA
var primary color.NRGBA
switch pr := theme.Color(theme.ColorNamePrimary); pr.(type) {
switch pr := theme.Color(theme.ColorNamePrimary).(type) {
case color.NRGBA:
primary = pr.(color.NRGBA)
primary = pr
case color.RGBA:
pr := pr.(color.RGBA)
primary = color.NRGBA{R: pr.R, G: pr.G, B: pr.B, A: pr.A}
}
ui/widgets/loadingdots.go
+4 -2
View File
@@ -28,8 +28,10 @@ type LoadingDots struct {
func NewLoadingDots() *LoadingDots {
l := &LoadingDots{}
for i := range l.dots {
l.dots[i] = minSizeCircle{Circle: canvas.Circle{
FillColor: theme.DisabledColor()},
l.dots[i] = minSizeCircle{
Circle: canvas.Circle{
FillColor: theme.DisabledColor(),
},
}
}
l.ExtendBaseWidget(l)
ui/widgets/multihyperlink.go
+5 -5
View File
@@ -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
-1
View File
@@ -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
+3 -3
View File
@@ -45,7 +45,7 @@ func NewStarRating() *StarRating {
func (s *StarRating) createContainer() {
s.container = container.New(layout.NewCustomPaddedHBoxLayout(0))
var im *canvas.Image
for i := 0; i < 5; i++ {
for i := range 5 {
if s.IsDisabled {
im = canvas.NewImageFromResource(themedDisabledStarOutline)
} else if s.Rating > i {
@@ -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
@@ -126,7 +126,7 @@ func (s *StarRating) Refresh() {
if !s.holdRating && s.mouseHoverRating > 0 {
rating = s.mouseHoverRating
}
for i := 0; i < 5; i++ {
for i := range 5 {
im := s.container.Objects[i].(*canvas.Image)
im.SetMinSize(fyne.NewSize(s.StarSize, s.StarSize))
if s.IsDisabled {
ui/widgets/tracklistloader.go
+1 -1
View File
@@ -58,7 +58,7 @@ func (t *TracklistLoader) loadMoreTracks(num int) {
t.trackBuffer = make([]*mediaprovider.Track, 0, num)
}
t.trackBuffer = t.trackBuffer[:0]
for i := 0; i < num; i++ {
for range num {
tr := t.iter.Next()
if tr == nil {
t.done = true
ui/widgets/tracklistrow.go
+1
View File
@@ -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
}