fixed pointer issue

internal/cli/shell.go

@@ -76,21 +76,29 @@ func (s musicObjectStore) currentMusicObjects() ([]data.MusicObject, error) {
 
 var indexSelectionPattern = regexp.MustCompile(`^[\d ,]+$`)
 
-func interpretCommand(command string, store musicObjectStore) (musicObjectStore, error) {
+func interpretCommand(command string, store musicObjectStore) (musicObjectStore, []error) {
 	// going back in history
 	if command == ".." {
 		if len(store) <= 1 {
-			return store, errors.New("can't go back")
+			return store, []error{errors.New("can't go back")}
 		}
 
-		return store[:len(store)-1], nil
+		return store[:len(store)-1], []error{}
+	}
+
+	forceDownload := false
+	if strings.HasPrefix(command, "d:") {
+		command, _ = strings.CutPrefix(command, "d:")
+		command = strings.TrimSpace(command)
+
+		forceDownload = true
 	}
 
 	// fetch special music object
 	if indexSelectionPattern.MatchString(command) {
 		currentMusicObjects, err := store.currentMusicObjects()
 		if err != nil {
-			return store, err
+			return store, []error{err}
 		}
 
 		var fetched data.MusicObject
@@ -99,14 +107,14 @@ func interpretCommand(command string, store musicObjectStore) (musicObjectStore,
 			index, _ := strconv.Atoi(strings.TrimSpace(stringIndex))
 
 			if index >= len(currentMusicObjects) || index < 0 {
-				return store, errors.New(command + " is out of bounds [0 <= " + strconv.Itoa(index) + " <= " + strconv.Itoa(len(currentMusicObjects)-1) + "]")
+				return store, []error{errors.New(command + " is out of bounds [0 <= " + strconv.Itoa(index) + " <= " + strconv.Itoa(len(currentMusicObjects)-1) + "]")}
 			}
 
 			current := currentMusicObjects[index]
 
 			newFetched, err := plugin.Fetch(current)
 			if err != nil {
-				return store, err
+				return store, []error{err}
 			}
 
 			if fetched == nil {
@@ -116,7 +124,13 @@ func interpretCommand(command string, store musicObjectStore) (musicObjectStore,
 			}
 		}
 
-		return append(store, fetched.Related()), nil
+		if forceDownload {
+			return store, plugin.Download(fetched)
+		} else {
+			return append(store, fetched.Related()), []error{}
+		}
+	} else if forceDownload {
+		return store, []error{errors.New("can only download indices not " + command)}
 	}
 
 	// search in every other case
@@ -126,7 +140,7 @@ func interpretCommand(command string, store musicObjectStore) (musicObjectStore,
 		fmt.Println()
 	}
 
-	return append(store, currentMusicObjects), nil
+	return append(store, currentMusicObjects), []error{}
 }
 
 func Shell(commandsList ...[]string) {
@@ -161,10 +175,13 @@ func Shell(commandsList ...[]string) {
 			fmt.Println("> " + command)
 		}
 
-		store, err = interpretCommand(strings.TrimSpace(command), store)
-		if err != nil {
+		var errList []error
+		store, errList = interpretCommand(strings.TrimSpace(command), store)
+		if len(errList) > 0 {
 			fmt.Println()
+			for _, err := range errList {
 				fmt.Println(color.Yellow + err.Error() + color.Reset)
+			}
 			fmt.Println()
 		}
 

internal/common/strings.go

@@ -84,7 +84,7 @@ func CleanSongTitle(title string, artistName string) string {
 	title = strings.TrimSpace(title)
 
 	for _, d := range commonTitleSuffix {
-		if strings.HasSuffix(strings.ToLower(d), d) {
+		if strings.HasSuffix(strings.ToLower(title), d) {
 			title = strings.TrimSpace(title[:len(d)-1])
 		}
 	}

internal/plugin/interface.go

@@ -2,6 +2,7 @@ package plugin
 
 import (
 	"errors"
+	"fmt"
 	"regexp"
 
 	"gitea.elara.ws/Hazel/music-kraken/internal/common"
@@ -163,7 +164,7 @@ func Fetch(musicObject data.MusicObject) (data.MusicObject, error) {
 		musicObject = musicObject.Merge(newMusicObject)
 	}
 
-	return musicObject, nil
+	return musicObject.Compile(), nil
 }
 
 type SearchConfig struct {
@@ -204,15 +205,21 @@ var variousAlbum = data.Album{
 	Name: "VariousAlbum",
 }.Compile().(data.Album)
 
-func downloadSong(song data.Song, state downloadState) {}
+func downloadSong(song data.Song, state downloadState) error {
+	fmt.Println("downloading: " + song.Name)
+	return nil
+}
 
-func Download(musicObject data.MusicObject, statesInput ...downloadState) {
+func Download(musicObject data.MusicObject, statesInput ...downloadState) []error {
 	state := downloadState{}
 	if len(statesInput) > 0 {
 		state = statesInput[0]
 	}
 
-	musicObject = musicObject.Compile()
+	musicObject, err := Fetch(musicObject)
+	if err != nil {
+		return []error{err}
+	}
 
 	if song, ok := musicObject.(data.Song); ok {
 		state.song = &song
@@ -232,8 +239,13 @@ func Download(musicObject data.MusicObject, statesInput ...downloadState) {
 				state.album = &variousAlbum
 			}
 		}
-		downloadSong(song, state)
-		return
+
+		err := downloadSong(song, state)
+		if err == nil {
+			return []error{}
+		} else {
+			return []error{err}
+		}
 	}
 
 	if album, ok := musicObject.(data.Album); ok {
@@ -247,18 +259,24 @@ func Download(musicObject data.MusicObject, statesInput ...downloadState) {
 			}
 		}
 
+		errList := []error{}
 		for _, song := range album.Songs {
-			Download(song, state)
+			errList = append(errList, Download(song, state)...)
 		}
-		return
+		return errList
 	}
 
 	if artist, ok := musicObject.(data.Artist); ok {
 		state.artist = &artist
 
+		errList := []error{}
 		for _, album := range artist.Albums {
-			Download(album, state)
+			errList = append(errList, Download(album, state)...)
 		}
-		return
+		return errList
+	}
+
+	return []error{
+		errors.New("music object not recognized"),
 	}
 }

main.go

@@ -7,6 +7,6 @@ import (
 func main() {
 	cli.Shell([]string{
 		"#a Crystal F",
-		"20",
+		"d: 0",
 	})
 }