pretty shell

internal/cli/shell.go

@@ -5,48 +5,57 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strconv"
 	"strings"
 
 	"gitea.elara.ws/Hazel/music-kraken/internal/data"
 	"gitea.elara.ws/Hazel/music-kraken/internal/plugin"
 )
 
+func zeroPad(num int, length int) string {
+	str := strconv.Itoa(num)
+	if len(str) >= length {
+		return str
+	}
+	return strings.Repeat("0", length-len(str)) + str
+}
+
 func printResults(musicObjects []data.MusicObject) {
 	if len(musicObjects) <= 0 {
 		return
 	}
 
-	for _, m := range musicObjects {
+	results := make([]string, len(musicObjects))
+
+	for i, m := range musicObjects {
+		results[i] = zeroPad(i, 2) + ": "
+
 		if a, ok := m.(data.Artist); ok {
-			fmt.Println("artist:  " + a.Name)
+			results[i] += "#a " + a.Name
-
 		} else if a, ok := m.(data.Album); ok {
-			fmt.Print("release: " + a.Name)
+			results[i] += "#r " + a.Name
 
-			if len(a.Artists) > 0 {
+			for _, artist := range a.Artists {
-				names := make([]string, len(a.Artists))
+				results[i] += " - " + artist.Name
-				for i, artist := range a.Artists {
-					names[i] = artist.Name
-				}
-				fmt.Println(" by " + strings.Join(names, ", "))
-			} else {
-				fmt.Println()
 			}
-
 		} else if a, ok := m.(data.Song); ok {
-			fmt.Print("track:   " + a.Name)
+			results[i] += "#s " + a.Name
-			if len(a.Artists) > 0 {
+
-				names := make([]string, len(a.Artists))
+			if a.Album.Name != "" {
-				for i, artist := range a.Artists {
+				results[i] += " - " + a.Album.Name
-					names[i] = artist.Name
-				}
-				fmt.Println(" by " + strings.Join(names, ", "))
-			} else {
-				fmt.Println()
 			}
+
+			for _, artist := range a.Artists {
+				results[i] += " - " + artist.Name
+			}
+		}
+
+		for _, source := range m.GetSources() {
+			results[i] += "\n\t- " + source.Url
 		}
 	}
 
+	fmt.Println(strings.Join(results, "\n"))
 	fmt.Println()
 }
 

internal/data/song.go

@@ -7,6 +7,7 @@ import (
 )
 
 type MusicObject interface {
+	GetSources() []Source
 	Compile() MusicObject
 	GetIndices() []string
 	Merge(other MusicObject) MusicObject
@@ -70,6 +71,10 @@ type Song struct {
 	Sources []Source
 }
 
+func (m Song) GetSources() []Source {
+	return m.Sources
+}
+
 func (m Song) GetIndices() []string {
 	res := sourceIndices(m.Sources)
 	if m.UnifiedName != "" {
@@ -122,6 +127,10 @@ type Album struct {
 	Sources []Source
 }
 
+func (m Album) GetSources() []Source {
+	return m.Sources
+}
+
 func (m Album) GetIndices() []string {
 	res := sourceIndices(m.Sources)
 	if m.UnifiedName != "" {
@@ -174,6 +183,10 @@ type Artist struct {
 	Sources []Source
 }
 
+func (m Artist) GetSources() []Source {
+	return m.Sources
+}
+
 func (m Artist) Merge(other MusicObject) MusicObject {
 	otherArtist, ok := other.(Artist)
 	if !ok {