feat: show menu for playlist items

Author: cybardev

cmd/ytgo/playlist.go

@@ -6,8 +6,6 @@ import (
 	"log"
 	"os"
 	"strings"
-
-	"github.com/ergochat/readline"
 )
 
 type Playlist string
@@ -21,15 +19,7 @@ func (p Playlist) Create() error {
 	defer playlist.Close()
 	w := bufio.NewWriter(playlist)
 
-	// create line reader for search
-	rl, err := readline.NewFromConfig(&readline.Config{
-		Prompt:  fmt.Sprintf("%sSearch:%s ", C_CYAN, C_RESET),
-		VimMode: true,
-	})
-	if err != nil {
-		return err
-	}
-	defer rl.Close()
+	rl := GetReadline()
 
 	// keep adding until user quits
 	for {
@@ -47,7 +37,11 @@ func (p Playlist) Create() error {
 		if query == "" {
 			continue
 		}
-		v, err := GetVideoFromMenu(query)
+		vs, err := GetSearchResults(query)
+		if err != nil {
+			return err
+		}
+		v, err := GetVideoFromMenu(vs)
 		if err != nil {
 			return err
 		}
@@ -61,24 +55,48 @@ func (p Playlist) Create() error {
 
 func (p Playlist) Play(m bool) error {
 	f := string(p)
+	prev := BACK_FLAG
+	for {
+		vs, err := getPlaylistVideos(f)
+		if err != nil {
+			return err
+		}
+		v, err := GetVideoFromMenu(vs)
+		if err != nil {
+			return err
+		}
+		switch v {
+		case nil:
+			return nil
+		case BACK_FLAG:
+			if prev == BACK_FLAG {
+				return nil
+			}
+			v = prev
+		}
+		v.Play(m)
+		prev = v
+	}
+}
+
+func getPlaylistVideos(f string) (*[]Video, error) {
 	playlist, err := os.ReadFile(f)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	lines := strings.Split(string(playlist), "\n")
+	var vs []Video
 	for i := 0; i < len(lines)-1; i++ {
 		id := lines[i]
 		if len(id) == 11 {
-			v := Video{Id: VID(id)}
-			v.Play(m)
+			v, err := GetVideoFromURL(VID(id).URL())
+			if err != nil {
+				return nil, err
+			}
+			vs = append(vs, *v)
 		} else {
-			log.Printf("%s[WARN]%s Skipped invalid Video ID: %s\n", C_YELLOW, C_RESET, id)
-		}
-		playlist, err := os.ReadFile(f)
-		if err != nil {
-			return err
+			log.Printf("%s[WARN]%s Skipped invalid Video ID on line %d: %s\n", C_YELLOW, C_RESET, i+1, id)
 		}
-		lines = strings.Split(string(playlist), "\n")
 	}
-	return nil
+	return &vs, nil
 }

cmd/ytgo/ui.go

@@ -5,11 +5,7 @@ import (
 	"github.com/rivo/tview"
 )
 
-func GetVideoFromMenu(query string) (*Video, error) {
-	vs, err := GetSearchResults(query)
-	if err != nil {
-		return nil, err
-	}
+func GetVideoFromMenu(vs *[]Video) (*Video, error) {
 	tview.Styles.PrimitiveBackgroundColor = tcell.ColorDefault
 	app := tview.NewApplication()
 	return getVideoFromList(app, vs)

cmd/ytgo/yt.go

@@ -68,22 +68,7 @@ func main() {
 
 	// get search query
 	if p {
-		home, _ := os.UserHomeDir()
-
-		// create line reader for search
-		rl, err = readline.NewFromConfig(&readline.Config{
-			Prompt:            fmt.Sprintf("%sSearch:%s ", C_CYAN, C_RESET),
-			HistoryFile:       fmt.Sprintf("%s/%s", home, ".ytgo_history"),
-			HistoryLimit:      48,
-			HistorySearchFold: true,
-			VimMode:           true,
-		})
-		rl.SetVimMode(true)
-		if err != nil {
-			log.Fatalln(err)
-		}
-		defer rl.Close()
-
+		rl = GetReadline()
 		goto prompt
 	}
 	query = strings.Join(flag.Args(), " ")
@@ -103,9 +88,12 @@ entrypoint:
 	if u {
 		v, err = GetVideoFromURL(query)
 	} else if i {
-		v, err = GetVideoFromMenu(query)
-		if v == BACK_FLAG {
-			goto prompt
+		vs, err := GetSearchResults(query)
+		if err == nil {
+			v, err = GetVideoFromMenu(vs)
+			if v == BACK_FLAG {
+				goto prompt
+			}
 		}
 	} else {
 		v, err = GetVideoFromSearch(query, n)
@@ -133,3 +121,19 @@ prompt:
 		goto entrypoint
 	}
 }
+
+func GetReadline() *readline.Instance {
+	home, _ := os.UserHomeDir()
+	rl, err := readline.NewFromConfig(&readline.Config{
+		Prompt:            fmt.Sprintf("%sSearch:%s ", C_CYAN, C_RESET),
+		HistoryFile:       fmt.Sprintf("%s/%s", home, ".ytgo_history"),
+		HistoryLimit:      48,
+		HistorySearchFold: true,
+		VimMode:           true,
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+	defer rl.Close()
+	return rl
+}