store any uri instead of only local ones

Author: sanderr

README.md

@@ -235,7 +235,7 @@ local:
 
 Display lyrics from local `.lrc` files.
 
-By default, the application will look for a file that is a sibling of a local music file (e.g. local player via mpdris), i.e. with the same path, with the extension replaced by `.lrc`.
+By default, the application will look for a file that is a sibling of a local music file (e.g. local player via mpris), i.e. with the same path, with the extension replaced by `.lrc`.
 
 If the `folder` config option is set, it will additionally search for files within that folder. If the player provides a relative path to the music file (e.g. mpd), an exact match is attempted first as described above. If that fails, a best-effort search will be performed, returning a `.lrc` file in the folder (can be nested) with the most similar name.
 

player/player.go

@@ -1,15 +1,16 @@
 package player
 
+import "net/url"
+
 type Player interface {
 	State() (*State, error)
 }
 
 type TrackMetadata struct {
 	// ID of the current track.
 	ID string
-	// URI is the path to the local music file, if it exists.
-	// May be either absolute or relative to the local music directory (configured in "local" source).
-	Uri string
+	// URI to music file, if it is known. May be a (local) relative path.
+	Uri *url.URL
 	// Query is a string that can be used to find lyrics.
 	Query string
 }

services/local/local.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"net/url"
 	"os"
 	"path/filepath"
 	"sptlrx/lyrics"
@@ -67,26 +68,12 @@ func (c *Client) findFile(track *player.TrackMetadata) string {
 	}
 
 	// If it is a local track, try for similarly named .lrc file first
-	if track.Uri != "" {
-		var absUri string
-		if filepath.IsAbs(track.Uri) {
-			// Uri is already absolute
-			absUri = track.Uri
-		} else if c.folder != "" {
-			// Uri is relative to local music directory
-			absUri = filepath.Join(c.folder, track.Uri)
-		} else {
-			// Can not handle relative uri without folder configured
-			absUri = ""
-		}
-		if absUri != "" {
-			absLyricsUri := strings.TrimSuffix(absUri, filepath.Ext(absUri)) + ".lrc"
-			if _, err := os.Stat(absLyricsUri); err == nil {
-				return absLyricsUri
-			}
-		}
+	var exactMatch string = c.fileByLocalUri(track.Uri)
+	if exactMatch != "" {
+		return exactMatch
 	}
 
+	// Fall back to best-effort search
 	parts := splitString(track.Query)
 
 	var best *file
@@ -115,6 +102,32 @@ func (c *Client) findFile(track *player.TrackMetadata) string {
 	return best.Path
 }
 
+func (c *Client) fileByLocalUri(uri *url.URL) string {
+	if uri == nil {
+		return ""
+	}
+	if uri.Scheme != "file" && uri.Scheme != "" {
+		return ""
+	}
+	var absUri string
+	if filepath.IsAbs(uri.Path) {
+		// uri is already absolute
+		absUri = uri.Path
+	} else if c.folder != "" {
+		// Uri is relative to local music directory
+		absUri = filepath.Join(c.folder, uri.Path)
+	} else {
+		// Can not handle relative uri without folder configured
+		return ""
+	}
+	absLyricsUri := strings.TrimSuffix(absUri, filepath.Ext(absUri)) + ".lrc"
+	_, err := os.Stat(absLyricsUri)
+	if err != nil {
+		return ""
+	}
+	return absLyricsUri
+}
+
 func createIndex(folder string) ([]*file, error) {
 	index := []*file{}
 	if folder == "" {

services/mpd/mpd.go

@@ -1,6 +1,7 @@
 package mpd
 
 import (
+	"net/url"
 	"sptlrx/player"
 	"strconv"
 
@@ -73,10 +74,16 @@ func (c *Client) State() (*player.State, error) {
 		query = title
 	}
 
+	var uri *url.URL
+	u, err := url.Parse(current["file"])
+	if err == nil && u.Path != "" {
+		uri = u
+	}
+
 	return &player.State{
 		Track:    player.TrackMetadata{
 			ID:    status["songid"],
-			Uri:   current["file"],
+			Uri:   uri,
 			Query: query,
 		},
 		Playing:  status["state"] == "play",

services/mpris/mpris_unix.go

@@ -81,13 +81,13 @@ func (c *Client) State() (*player.State, error) {
 		title = t
 	}
 
-	var uri string
+	var uri *url.URL
 	// In case the player uses the file name with extension as title
 	if u, ok := meta["xesam:url"].Value().(string); ok {
 		u, err := url.Parse(u)
-		if err == nil {
+		if err == nil && u.Path != "" {
 			ext := filepath.Ext(u.Path)
-			uri = u.Path
+			uri = u
 			// some players use filename as title when tag is absent => trim extension from title
 			title = strings.TrimSuffix(title, ext)
 		}