Merge branch 'main' of ssh://github.com/hilli/go-kef-w2

Author: hilli

CHANGELOG.md

@@ -7,6 +7,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.6] - 2026-02-06
+
+### Added
+
+- **Stop command**: New `kefw2 stop` command to stop playback entirely
+  - Unlike pause, stop ends the current stream completely
+  - Useful for radio and live streams where pause is not meaningful
+- **Library: Stop method**: New `Stop(ctx)` method for programmatic stream termination
+- **Browse container configuration**: Set a default starting folder for UPnP browsing
+  - `config upnp container browse <path>` - Set the starting container for browsing
+  - Skips parent containers and other servers for a cleaner navigation experience
+- **Browse cache**: New browse cache system for faster navigation and tab completion
+  - Caches container listings with configurable TTLs per service type
+  - Automatic cache persistence and cleanup
+- **Cache search**: Search cached entries for quick offline lookups
+- **Library: Track indexing moved to kefw2 package**: Track index functionality is now part of the library
+  - `kefw2.LoadTrackIndex()`, `kefw2.SaveTrackIndex()`, `kefw2.BuildTrackIndex()`
+  - `kefw2.SearchTracks()`, `kefw2.TrackIndexPath()`, `kefw2.IsTrackIndexFresh()`
+  - `kefw2.FindContainerByPath()`, `kefw2.ListContainersAtPath()`
+
+### Changed
+
+- **Reorganized UPnP container config**: Moved from `config upnp index container` to `config upnp container index`
+  - `config upnp container browse` - Configure starting folder for browsing
+  - `config upnp container index` - Configure folder to index for search
+- **Improved queue playback**: Fixed queue track playback to properly handle metadata and resources
+- **Enhanced UPnP track metadata handling**: Preserve original serviceID and support Airable-specific metadata fields
+
+### Fixed
+
+- **Speaker discovery goroutine leak**: Fixed dnssd goroutine leak by using context.WithCancel instead of context.WithTimeout
+- **Player event duration fallback**: Duration now correctly falls back to MediaData.Resources or ActiveResource when Status.Duration is zero
+- **Podcast playback**: Improved handling of Airable podcast authentication by playing through parent containers
+- **Queue index playback**: Queue items now fetch track details when not provided
+
 ## [0.2.5] - 2026-02-05
 
 ### Added
@@ -382,7 +417,8 @@ Implemented by: `Source`, `SpeakerStatus`, `CableMode`
 
 7. **Update player ID field access**: If you access `playId.SystemMemberId`, change it to `playId.SystemMemberID`.
 
-[Unreleased]: https://github.com/hilli/go-kef-w2/compare/v0.2.5...HEAD
+[Unreleased]: https://github.com/hilli/go-kef-w2/compare/v0.2.6...HEAD
+[0.2.6]: https://github.com/hilli/go-kef-w2/compare/v0.2.5...v0.2.6
 [0.2.5]: https://github.com/hilli/go-kef-w2/compare/v0.2.4...v0.2.5
 [0.2.4]: https://github.com/hilli/go-kef-w2/compare/v0.2.3...v0.2.4
 [0.2.3]: https://github.com/hilli/go-kef-w2/compare/v0.2.2...v0.2.3

README.md

@@ -123,6 +123,12 @@ kefw2 play
 kefw2 pause
 ```
 
+Stop playback entirely (useful for radio/live streams)
+
+```shell
+kefw2 stop
+```
+
 Seek to a specific position in the current track or podcast
 
 ```shell
@@ -246,7 +252,10 @@ scanning duplicate views (By Genre, By Album, etc. contain the same tracks):
 
 ```shell
 # Set the container path to index (with tab completion)
-kefw2 config upnp index container "Music/Hilli's Music/By Folder"
+kefw2 config upnp container index "Music/Hilli's Music/By Folder"
+
+# Set a default starting folder for browsing
+kefw2 config upnp container browse "Music/Hilli's Music"
 
 # Show current index status
 kefw2 upnp index
@@ -258,7 +267,7 @@ kefw2 upnp index --rebuild
 kefw2 upnp index --rebuild --container "Music/My Library/By Album"
 
 # Clear the container setting (index entire server)
-kefw2 config upnp index container ""
+kefw2 config upnp container index ""
 ```
 
 The container path uses `/` as separator and supports tab completion at each level.

cmd/kefw2/cmd/cache.go

@@ -29,6 +29,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hilli/go-kef-w2/kefw2"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -406,7 +407,7 @@ var cacheStatusCmd = &cobra.Command{
 
 		// Show UPnP track index status
 		headerPrinter.Println("\nUPnP Track Index:")
-		index, err := LoadTrackIndex()
+		index, err := kefw2.LoadTrackIndex()
 		if err != nil || index == nil {
 			contentPrinter.Println("  No index found")
 			contentPrinter.Println("  Run 'kefw2 upnp index --rebuild' to create one")
@@ -417,7 +418,7 @@ var cacheStatusCmd = &cobra.Command{
 			}
 			contentPrinter.Printf("  Tracks: %d\n", index.TrackCount)
 			contentPrinter.Printf("  Age: %v\n", time.Since(index.IndexedAt).Round(time.Second))
-			contentPrinter.Printf("  Location: %s\n", getTrackIndexPath())
+			contentPrinter.Printf("  Location: %s\n", kefw2.TrackIndexPath())
 		}
 	},
 }

cmd/kefw2/cmd/config_upnp.go

@@ -153,39 +153,110 @@ func UPnPServerCompletion(_ *cobra.Command, args []string, toComplete string) ([
 }
 
 // upnpIndexConfigCmd is the parent for index config subcommands.
-var upnpIndexConfigCmd = &cobra.Command{
-	Use:   "index",
-	Short: "Configure UPnP search index settings",
-	Long:  `Configure settings for the UPnP search index, including the container path to index.`,
+var upnpContainerConfigCmd = &cobra.Command{
+	Use:   "container",
+	Short: "Configure UPnP container paths",
+	Long:  `Configure container paths for browsing and indexing.`,
 	Run: func(cmd *cobra.Command, _ []string) {
 		_ = cmd.Help()
 	},
 }
 
-// upnpIndexContainerCmd shows or sets the index container path.
-var upnpIndexContainerCmd = &cobra.Command{
-	Use:   "container [path]",
+// upnpContainerBrowseCmd shows or sets the browse container path.
+var upnpContainerBrowseCmd = &cobra.Command{
+	Use:   "browse [path]",
+	Short: "Show or set the container path for browsing",
+	Long: `Show the current container path for browsing, or set a new one.
+
+The browse container determines the starting point when browsing your UPnP library.
+When set, you won't see parent containers or other servers - the browse container
+becomes your "root" for navigation.
+
+Use "/" as separator for nested paths.
+
+Without arguments, displays the current setting.
+With a path, sets that as the starting container for browsing.
+
+Examples:
+  kefw2 config upnp container browse                           # Show current
+  kefw2 config upnp container browse "Music"                   # Start from Music folder
+  kefw2 config upnp container browse "Music/Hilli's Music"     # Start from specific folder
+  kefw2 config upnp container browse ""                        # Clear (show all servers)`,
+	Run: func(_ *cobra.Command, args []string) {
+		if len(args) == 0 {
+			// Show current setting
+			containerPath := viper.GetString("upnp.browse_container")
+			if containerPath == "" {
+				contentPrinter.Println("No browse container configured (will show all servers).")
+				contentPrinter.Println("Use 'kefw2 config upnp container browse <path>' to set one.")
+				return
+			}
+			headerPrinter.Print("Browse container: ")
+			contentPrinter.Println(containerPath)
+			return
+		}
+
+		// Set new container path
+		containerPath := args[0]
+
+		// If a path is provided, validate it exists
+		if containerPath != "" {
+			serverPath := viper.GetString("upnp.default_server_path")
+			if serverPath == "" {
+				exitWithError("No default UPnP server configured. Set one first with: kefw2 config upnp server default <name>")
+			}
+
+			client := kefw2.NewAirableClient(currentSpeaker)
+			_, resolvedName, err := kefw2.FindContainerByPath(client, serverPath, containerPath)
+			if err != nil {
+				exitWithError("Invalid container path: %v", err)
+			}
+			// Use the resolved path (with proper casing)
+			containerPath = resolvedName
+		}
+
+		// Save to config
+		viper.Set("upnp.browse_container", containerPath)
+		err := viper.WriteConfig()
+		exitOnError(err, "Error saving config")
+
+		if containerPath == "" {
+			taskConpletedPrinter.Println("Browse container cleared (will show all servers)")
+		} else {
+			taskConpletedPrinter.Print("Browse container set: ")
+			contentPrinter.Println(containerPath)
+		}
+	},
+	ValidArgsFunction: UPnPContainerCompletion,
+}
+
+// upnpContainerIndexCmd shows or sets the index container path.
+var upnpContainerIndexCmd = &cobra.Command{
+	Use:   "index [path]",
 	Short: "Show or set the container path for indexing",
 	Long: `Show the current container path for indexing, or set a new one.
 
 The container path determines which folder to start indexing from.
 Use "/" as separator for nested paths.
 
+TIP: For best results, use a "By Folder" path (e.g., "Music/Hilli's Music/By Folder").
+This indexes your actual folder structure without any reorganization by the media server.
+
 Without arguments, displays the current setting.
 With a path, sets that as the default container to index.
 
 Examples:
-  kefw2 config upnp index container                                  # Show current
-  kefw2 config upnp index container "Music"                          # Index Music folder
-  kefw2 config upnp index container "Music/Hilli's Music/By Folder"  # Index specific folder
-  kefw2 config upnp index container ""                               # Clear (index entire server)`,
+  kefw2 config upnp container index                                  # Show current
+  kefw2 config upnp container index "Music"                          # Index Music folder
+  kefw2 config upnp container index "Music/Hilli's Music/By Folder"  # Index by folder (recommended)
+  kefw2 config upnp container index ""                               # Clear (index entire server)`,
 	Run: func(_ *cobra.Command, args []string) {
 		if len(args) == 0 {
 			// Show current setting
 			containerPath := viper.GetString("upnp.index_container")
 			if containerPath == "" {
 				contentPrinter.Println("No index container configured (will index entire server).")
-				contentPrinter.Println("Use 'kefw2 config upnp index container <path>' to set one.")
+				contentPrinter.Println("Use 'kefw2 config upnp container index <path>' to set one.")
 				return
 			}
 			headerPrinter.Print("Index container: ")
@@ -204,12 +275,12 @@ Examples:
 			}
 
 			client := kefw2.NewAirableClient(currentSpeaker)
-			_, resolvedPath, err := findContainerByPath(client, serverPath, containerPath)
+			_, resolvedName, err := kefw2.FindContainerByPath(client, serverPath, containerPath)
 			if err != nil {
 				exitWithError("Invalid container path: %v", err)
 			}
 			// Use the resolved path (with proper casing)
-			containerPath = resolvedPath
+			containerPath = resolvedName
 		}
 
 		// Save to config
@@ -256,7 +327,7 @@ func UPnPContainerCompletion(_ *cobra.Command, args []string, toComplete string)
 	}
 
 	// Get containers at the parent path
-	containers, err := listContainersAtPath(client, serverPath, parentPath)
+	containers, err := kefw2.ListContainersAtPath(client, serverPath, parentPath)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
@@ -285,6 +356,7 @@ func init() {
 	upnpConfigCmd.AddCommand(upnpServerConfigCmd)
 	upnpServerConfigCmd.AddCommand(upnpServerDefaultCmd)
 	upnpServerConfigCmd.AddCommand(upnpServerListCmd)
-	upnpConfigCmd.AddCommand(upnpIndexConfigCmd)
-	upnpIndexConfigCmd.AddCommand(upnpIndexContainerCmd)
+	upnpConfigCmd.AddCommand(upnpContainerConfigCmd)
+	upnpContainerConfigCmd.AddCommand(upnpContainerBrowseCmd)
+	upnpContainerConfigCmd.AddCommand(upnpContainerIndexCmd)
 }

cmd/kefw2/cmd/stop.go

@@ -0,0 +1,49 @@
+/*
+Copyright © 2023-2026 Jens Hilligsøe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+// stopCmd stops playback entirely (useful for radio/live streams where pause is not meaningful).
+var stopCmd = &cobra.Command{
+	Use:   "stop",
+	Short: "Stop playback when on WiFi/BT source",
+	Long:  `Stop playback entirely. Unlike pause, this ends the current stream and is particularly useful for radio and live streams.`,
+	Args:  cobra.MaximumNArgs(0),
+	Run: func(cmd *cobra.Command, _ []string) {
+		ctx := cmd.Context()
+		canControlPlayback, err := currentSpeaker.CanControlPlayback(ctx)
+		exitOnError(err, "Can't stop speaker")
+		if !canControlPlayback {
+			headerPrinter.Println("Can't stop speaker: Not on WiFi/BT source.")
+			return
+		}
+		err = currentSpeaker.Stop(ctx)
+		exitOnError(err, "Can't stop playback")
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(stopCmd)
+}