Merge branch 'dweymouth:main' into main

Author: benoit-smith

.github/workflows/build-windows.yml

@@ -45,8 +45,8 @@ jobs:
 
     - name: Download mpv dll
       run: >
-        wget https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20250706/mpv-dev-x86_64-v3-20250706-git-db7bc59.7z &&
-        7z x mpv-dev-x86_64-v3-20250706-git-db7bc59.7z
+        wget https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20250810/mpv-dev-x86_64-v3-20250810-git-01b7edc.7z &&
+        7z x mpv-dev-x86_64-v3-20250810-git-01b7edc.7z
 
     - name: Download smtc dll
       run: >

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [0.18.0]
+
+### Added
+- [#665](https://github.com/dweymouth/supersonic/issues/665) Make play button on Albums page configurable to shuffle or play in order
+- [#668](https://github.com/dweymouth/supersonic/issues/668) Add sample rate, bit depth, and channel count to track info dialog
+- [#669](https://github.com/dweymouth/supersonic/pull/669) Add waveform seekbar
+- [#671](https://github.com/dweymouth/supersonic/pull/671) Add CLI commands to start minimized, and to show/raise the app window
+- [#674](https://github.com/dweymouth/supersonic/pull/674) Add CLI commands to search and play albums, tracks, and playlists
+- [#679](https://github.com/dweymouth/supersonic/pull/679) Add player control buttons to Windows taskbar thumbnail
+- [#681](https://github.com/dweymouth/supersonic/pull/681) Add ability to stop playback after current track finishes
+
 ## [0.17.0]
 
 ### Added

FyneApp.toml

@@ -1,7 +1,7 @@
 [Details]
   Icon = "res/appicon-512.png"
   Name = "Supersonic"
-  Version = "0.17.0"
+  Version = "0.18.0"
 
 [LinuxAndBSD]
   Categories = ["Audio", "AudioVideo"]

README.md

@@ -42,6 +42,7 @@ Supersonic supports any music server with a Subsonic (or OpenSubsonic) API, or J
 * [x] Light and Dark themes, with optional auto theme switching
 * [x] High-quality gapless audio playback powered by MPV, with optional audio exclusive mode
 * [x] ReplayGain support (depends on files being tagged on server)
+* [x] Waveform seekbar
 * [x] [Custom themes](https://github.com/dweymouth/supersonic/wiki/Custom-Themes) 
 * [x] MPRIS and Mac OS media center integration for media key and desktop control
 * [x] Built-in 15-band graphic equalizer

backend/app.go

@@ -20,6 +20,7 @@ import (
 	"github.com/dweymouth/supersonic/backend/player"
 	"github.com/dweymouth/supersonic/backend/player/mpv"
 	"github.com/dweymouth/supersonic/backend/util"
+	"github.com/dweymouth/supersonic/backend/windows"
 	"github.com/google/uuid"
 
 	"github.com/20after4/configdir"
@@ -49,7 +50,7 @@ type App struct {
 	LocalPlayer     *mpv.Player
 	UpdateChecker   UpdateChecker
 	MPRISHandler    *MPRISHandler
-	WinSMTC         *SMTC
+	WinSMTC         *windows.SMTC
 	ipcServer       ipc.IPCServer
 	LrcLibFetcher   *LrcLibFetcher
 
@@ -192,7 +193,10 @@ func StartupApp(appName, displayAppName, appVersion, appVersionTag, latestReleas
 		ipc.DestroyConn() // cleanup socket possibly orphaned by crashed process
 		listener, err := ipc.Listen()
 		if err == nil {
-			a.ipcServer = ipc.NewServer(a.PlaybackManager, a.callOnReactivate,
+			a.ipcServer = ipc.NewServer(
+				a.PlaybackManager,
+				a.ServerManager,
+				a.callOnReactivate,
 				func() { _ = a.callOnExit() })
 			go a.ipcServer.Serve(listener)
 		} else {
@@ -378,25 +382,25 @@ func (a *App) setupMPRIS(mprisAppName string) {
 }
 
 func (a *App) SetupWindowsSMTC(hwnd uintptr) {
-	smtc, err := InitSMTCForWindow(hwnd)
+	smtc, err := windows.InitSMTCForWindow(hwnd)
 	if err != nil {
 		log.Printf("error initializing SMTC: %d", err)
 		return
 	}
 	a.WinSMTC = smtc
 	smtc.UpdateMetadata(a.displayAppName, "")
 
-	smtc.OnButtonPressed(func(btn SMTCButton) {
+	smtc.OnButtonPressed(func(btn windows.SMTCButton) {
 		switch btn {
-		case SMTCButtonPlay:
+		case windows.SMTCButtonPlay:
 			a.PlaybackManager.Continue()
-		case SMTCButtonPause:
+		case windows.SMTCButtonPause:
 			a.PlaybackManager.Pause()
-		case SMTCButtonNext:
+		case windows.SMTCButtonNext:
 			a.PlaybackManager.SeekNext()
-		case SMTCButtonPrevious:
+		case windows.SMTCButtonPrevious:
 			a.PlaybackManager.SeekBackOrPrevious()
-		case SMTCButtonStop:
+		case windows.SMTCButtonStop:
 			a.PlaybackManager.Stop()
 		}
 	})
@@ -425,18 +429,37 @@ func (a *App) SetupWindowsSMTC(hwnd uintptr) {
 	})
 	a.PlaybackManager.OnPlaying(func() {
 		smtc.SetEnabled(true)
-		smtc.UpdatePlaybackState(SMTCPlaybackStatePlaying)
+		smtc.UpdatePlaybackState(windows.SMTCPlaybackStatePlaying)
 	})
 	a.PlaybackManager.OnPaused(func() {
 		smtc.SetEnabled(true)
-		smtc.UpdatePlaybackState(SMTCPlaybackStatePaused)
+		smtc.UpdatePlaybackState(windows.SMTCPlaybackStatePaused)
 	})
 	a.PlaybackManager.OnStopped(func() {
 		smtc.SetEnabled(false)
-		smtc.UpdatePlaybackState(SMTCPlaybackStateStopped)
+		smtc.UpdatePlaybackState(windows.SMTCPlaybackStateStopped)
 	})
 }
 
+func (a *App) SetupWindowsTaskbarButtons(hwnd uintptr) {
+	windows.InitializeTaskbarButtons(hwnd, func(btn windows.TaskbarButton) {
+		switch btn {
+		case windows.TaskbarButtonPrevious:
+			a.PlaybackManager.SeekBackOrPrevious()
+		case windows.TaskbarButtonPlayPause:
+			a.PlaybackManager.PlayPause()
+		case windows.TaskbarButtonNext:
+			a.PlaybackManager.SeekNext()
+		}
+	})
+	a.PlaybackManager.OnPlaying(func() {
+		windows.SetTaskbarButtonIsPlaying(true)
+	})
+	f := func() { windows.SetTaskbarButtonIsPlaying(false) }
+	a.PlaybackManager.OnPaused(f)
+	a.PlaybackManager.OnStopped(f)
+}
+
 func (a *App) LoginToDefaultServer() error {
 	serverCfg := a.ServerManager.GetDefaultServer()
 	if serverCfg == nil {
@@ -548,6 +571,10 @@ func (a *App) checkFlagsAndSendIPCMsg(cli *ipc.Client) error {
 		return cli.SeekBackOrPrevious()
 	case *FlagNext:
 		return cli.SeekNext()
+	case *FlagStop:
+		return cli.Stop()
+	case *FlagStopAfterCurrent:
+		return cli.StopAfterCurrent()
 	case *FlagShow:
 		return cli.Show()
 	case VolumeCLIArg >= 0:
@@ -558,6 +585,30 @@ func (a *App) checkFlagsAndSendIPCMsg(cli *ipc.Client) error {
 		return cli.SeekSeconds(SeekToCLIArg)
 	case SeekByCLIArg != 0:
 		return cli.SeekBySeconds(SeekByCLIArg)
+	case PlayAlbumCLIArg != "":
+		return cli.PlayAlbum(PlayAlbumCLIArg, FirstTrackCLIArg, *FlagShuffle)
+	case PlayPlaylistCLIArg != "":
+		return cli.PlayPlaylist(PlayPlaylistCLIArg, FirstTrackCLIArg, *FlagShuffle)
+	case PlayTrackCLIArg != "":
+		return cli.PlayTrack(PlayTrackCLIArg)
+	case SearchAlbumCLIArg != "":
+		data, err := cli.SearchAlbum(SearchAlbumCLIArg)
+		if err == nil {
+			fmt.Println(data)
+		}
+		return err
+	case SearchPlaylistCLIArg != "":
+		data, err := cli.SearchPlaylist(SearchPlaylistCLIArg)
+		if err == nil {
+			fmt.Println(data)
+		}
+		return err
+	case SearchTrackCLIArg != "":
+		data, err := cli.SearchTrack(SearchTrackCLIArg)
+		if err == nil {
+			fmt.Println(data)
+		}
+		return err
 	default:
 		return nil
 	}

backend/cmdlineoptions.go

@@ -2,25 +2,42 @@ package backend
 
 import (
 	"flag"
+	"os"
 	"strconv"
 	"strings"
+
+	"golang.org/x/term"
 )
 
 var (
-	VolumeCLIArg    int     = -1
-	SeekToCLIArg    float64 = -1
-	SeekByCLIArg    float64 = 0
-	VolumePctCLIArg float64 = 0
-
-	FlagPlay           = flag.Bool("play", false, "unpause or begin playback")
-	FlagPause          = flag.Bool("pause", false, "pause playback")
-	FlagPlayPause      = flag.Bool("play-pause", false, "toggle play/pause state")
-	FlagPrevious       = flag.Bool("previous", false, "seek to previous track or beginning of current")
-	FlagNext           = flag.Bool("next", false, "seek to next track")
-	FlagStartMinimized = flag.Bool("start-minimized", false, "start app minimized")
-	FlagShow           = flag.Bool("show", false, "show minimized app")
-	FlagVersion        = flag.Bool("version", false, "print app version and exit")
-	FlagHelp           = flag.Bool("help", false, "print command line options and exit")
+	VolumeCLIArg         int     = -1
+	SeekToCLIArg         float64 = -1
+	SeekByCLIArg         float64 = 0
+	VolumePctCLIArg      float64 = 0
+	PlayAlbumCLIArg      string  = ""
+	PlayPlaylistCLIArg   string  = ""
+	PlayTrackCLIArg      string  = ""
+	FirstTrackCLIArg     int     = 0
+	SearchAlbumCLIArg    string  = ""
+	SearchPlaylistCLIArg string  = ""
+	SearchTrackCLIArg    string  = ""
+
+	FlagPlay             = flag.Bool("play", false, "unpause or begin playback")
+	FlagPause            = flag.Bool("pause", false, "pause playback")
+	FlagPlayPause        = flag.Bool("play-pause", false, "toggle play/pause state")
+	FlagPrevious         = flag.Bool("previous", false, "seek to previous track or beginning of current")
+	FlagNext             = flag.Bool("next", false, "seek to next track")
+	FlagStop             = flag.Bool("stop", false, "stop playback")
+	FlagStopAfterCurrent = flag.Bool("stop-after-current", false, "stop playback after current track")
+	FlagStartMinimized   = flag.Bool("start-minimized", false, "start app minimized")
+	FlagShow             = flag.Bool("show", false, "show minimized app")
+	FlagShuffle          = flag.Bool("shuffle", false, "shuffle the tracklist (to be used with either -play-album-by-id or -play-playlist-by-id)")
+	FlagVersion          = flag.Bool("version", false, "print app version and exit")
+	FlagHelp             = flag.Bool("help", false, "print command line options and exit")
+
+	FlagPlayAlbum    *bool
+	FlagPlayPlaylist *bool
+	FlagPlayTrack    *bool
 )
 
 func init() {
@@ -48,6 +65,43 @@ func init() {
 		VolumePctCLIArg = v
 		return err
 	})
+
+	if term.IsTerminal(int(os.Stdin.Fd())) {
+		flag.Func("play-album-by-id", "start playing the album with the given ID (can also be passed from standard input)", func(s string) error {
+			PlayAlbumCLIArg = s
+			return nil
+		})
+		flag.Func("play-playlist-by-id", "start playing the playlist with the given ID (can also be passed from standard input)", func(s string) error {
+			PlayPlaylistCLIArg = s
+			return nil
+		})
+		flag.Func("play-track-by-id", "start playing the track with the given ID (can also be passed from standard input)", func(s string) error {
+			PlayTrackCLIArg = s
+			return nil
+		})
+	} else {
+		FlagPlayAlbum = flag.Bool("play-album-by-id", false, "")
+		FlagPlayPlaylist = flag.Bool("play-playlist-by-id", false, "")
+		FlagPlayTrack = flag.Bool("play-track-by-id", false, "")
+	}
+	flag.Func("first-track", "start playing from given track (positive integer, to be used with either -play-album or -play-playlist)", func(s string) error {
+		v, err := strconv.Atoi(s)
+		FirstTrackCLIArg = v
+		return err
+	})
+
+	flag.Func("search-album", "search album by name, return results as JSON", func(s string) error {
+		SearchAlbumCLIArg = s
+		return nil
+	})
+	flag.Func("search-playlist", "search playlist by name, return results as JSON", func(s string) error {
+		SearchPlaylistCLIArg = s
+		return nil
+	})
+	flag.Func("search-track", "search track by name, return results as JSON", func(s string) error {
+		SearchTrackCLIArg = s
+		return nil
+	})
 }
 
 func HaveCommandLineOptions() bool {

backend/config.go

@@ -70,7 +70,8 @@ type AlbumPageConfig struct {
 type AlbumsPageConfig struct {
 	SortOrder   string // only relevant for Albums page
 	ShowYears   bool
-	ShuffleMode string // only relevant for genre page
+	ShuffleMode string // only relevant for Genre page
+	PlayInOrder bool   // only relevant for Albums page
 }
 
 type ArtistPageConfig struct {

backend/ipc/api.go

@@ -1,25 +1,37 @@
 package ipc
 
-import "fmt"
+import (
+	"encoding/json"
+	"fmt"
+	"net/url"
+)
 
 const (
-	PingPath         = "/ping"
-	PlayPath         = "/transport/play"
-	PlayPausePath    = "/transport/playpause"
-	PausePath        = "/transport/pause"
-	StopPath         = "/transport/stop"
-	PreviousPath     = "/transport/previous"
-	NextPath         = "/transport/next"
-	TimePosPath      = "/transport/timepos" // ?s=<seconds>
-	SeekByPath       = "/transport/seek-by" // ?s=<+/- seconds>
-	VolumePath       = "/volume"            // ?v=<vol>
-	VolumeAdjustPath = "/volume/adjust"     // ?pct=<+/- percentage>
-	ShowPath         = "/window/show"
-	QuitPath         = "/window/quit"
+	PingPath             = "/ping"
+	PlayPath             = "/transport/play"
+	PlayAlbumPath        = "/transport/play-album"      // ?id=<album ID>&t=<firstTrack>&s=<shuffle>
+	PlayPlaylistPath     = "/transport/play-playlist"   // ?id=<playlist ID>&t=<firstTrack>&s=<shuffle>
+	PlayTrackPath        = "/transport/play-track"      // ?id=<track ID>
+	SearchAlbumPath      = "/transport/search-album"    // ?s=<searchQuery>
+	SearchPlaylistPath   = "/transport/search-playlist" // ?s=<searchQuery>
+	SearchTrackPath      = "/transport/search-track"    // ?s=<searchQuery>
+	PlayPausePath        = "/transport/playpause"
+	PausePath            = "/transport/pause"
+	StopPath             = "/transport/stop"
+	StopAfterCurrentPath = "/transport/stop-after-current"
+	PreviousPath         = "/transport/previous"
+	NextPath             = "/transport/next"
+	TimePosPath          = "/transport/timepos" // ?s=<seconds>
+	SeekByPath           = "/transport/seek-by" // ?s=<+/- seconds>
+	VolumePath           = "/volume"            // ?v=<vol>
+	VolumeAdjustPath     = "/volume/adjust"     // ?pct=<+/- percentage>
+	ShowPath             = "/window/show"
+	QuitPath             = "/window/quit"
 )
 
 type Response struct {
-	Error string `json:"error"`
+	Data  json.RawMessage `json:"data"`
+	Error string          `json:"error"`
 }
 
 func SetVolumePath(vol int) string {
@@ -37,3 +49,30 @@ func SeekToSecondsPath(secs float64) string {
 func SeekBySecondsPath(secs float64) string {
 	return fmt.Sprintf("%s?s=%0.2f", SeekByPath, secs)
 }
+
+func BuildPlayAlbumPath(id string, firstTrack int, shuffle bool) string {
+	return fmt.Sprintf("%s?id=%s&t=%d&s=%t", PlayAlbumPath, id, firstTrack, shuffle)
+}
+
+func BuildPlayPlaylistPath(id string, firstTrack int, shuffle bool) string {
+	return fmt.Sprintf("%s?id=%s&t=%d&s=%t", PlayPlaylistPath, id, firstTrack, shuffle)
+}
+
+func BuildPlayTrackPath(id string) string {
+	return fmt.Sprintf("%s?id=%s", PlayTrackPath, id)
+}
+
+func BuildSearchAlbumPath(search string) string {
+	s := url.QueryEscape(search)
+	return fmt.Sprintf("%s?s=%s", SearchAlbumPath, s)
+}
+
+func BuildSearchPlaylistPath(search string) string {
+	s := url.QueryEscape(search)
+	return fmt.Sprintf("%s?s=%s", SearchPlaylistPath, s)
+}
+
+func BuildSearchTrackPath(search string) string {
+	s := url.QueryEscape(search)
+	return fmt.Sprintf("%s?s=%s", SearchTrackPath, s)
+}