re: reorganize code, simplify data types

Author: cybardev

cmd/ytgo/playlist.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 )
 
+type videoCache map[uint32][]Video // cache: content hash -> parsed videos
+
 type Playlist string
 
 func (p Playlist) Create() error {
@@ -57,28 +59,14 @@ func (p Playlist) Create() error {
 }
 
 func (p Playlist) Play(m bool) error {
-	var vs *[]Video
 	prevVideo := BACK_FLAG
-	playlistCache := make(map[uint32]*[]Video) // cache: content hash -> parsed videos
+	c := make(videoCache)
 	f := string(p)
 	for {
-		pl, err := os.ReadFile(f)
+		vs, err := getPlaylistVideos(f, c)
 		if err != nil {
 			return err
 		}
-
-		// check if we've already parsed this playlist content
-		contentHash := crc32.ChecksumIEEE(pl)
-		if cached, exists := playlistCache[contentHash]; exists {
-			vs = cached // use cached parsed videos
-		} else {
-			vs, err = getPlaylistVideos(pl) // parse for first time
-			if err != nil {
-				return err
-			}
-			playlistCache[contentHash] = vs // cache the result
-		}
-
 		v, err := GetVideoFromMenu(vs)
 		if err != nil {
 			return err
@@ -97,20 +85,34 @@ func (p Playlist) Play(m bool) error {
 	}
 }
 
-func getPlaylistVideos(pl []byte) (*[]Video, error) {
+func getPlaylistVideos(filename string, cache videoCache) ([]Video, error) {
+	pl, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	// check if we've already parsed this playlist content
+	contentHash := crc32.ChecksumIEEE(pl)
+	if cached, exists := cache[contentHash]; exists {
+		return cached, nil // use cached parsed videos
+	}
+
 	lines := strings.Split(string(pl), "\n")
 	var vs []Video
-	for i := 0; i < len(lines)-1; i++ {
-		id := lines[i]
-		if len(id) == 11 {
+	for i, id := range lines {
+		switch len(id) {
+		case 0:
+			continue // skip empty lines
+		case 11:
 			v, err := GetVideoFromURL(VID(id).URL())
 			if err != nil {
 				return nil, err
 			}
 			vs = append(vs, *v)
-		} else {
+		default:
 			log.Printf("%s[WARN]%s Skipped invalid Video ID on line %d: %s\n", C_YELLOW, C_RESET, i+1, id)
 		}
 	}
-	return &vs, nil
+	cache[contentHash] = vs // cache the result
+	return vs, nil
 }

cmd/ytgo/resparse.go

@@ -48,7 +48,7 @@ func getVideoFromDetails(j *map[string]any) (*Video, error) {
 
 type SearchRes string // Search Response
 
-func (r SearchRes) Parse() (*[]Video, error) {
+func (r SearchRes) Parse() ([]Video, error) {
 	re := regexp.MustCompile(`var ytInitialData = ({.*?});`)
 	s := re.FindStringSubmatch(string(r))[1]
 	var j any
@@ -60,15 +60,15 @@ func (r SearchRes) Parse() (*[]Video, error) {
 	return getVideoList(&res), nil
 }
 
-func getVideoList(j *[]any) *[]Video {
+func getVideoList(j *[]any) []Video {
 	var vs []Video
 	for _, i := range *j {
 		v, isVideo := getVideoFromEntry(&i)
 		if isVideo {
 			vs = append(vs, *v)
 		}
 	}
-	return &vs
+	return vs
 }
 
 func getVideoFromEntry(j *any) (*Video, bool) {

cmd/ytgo/search.go

@@ -20,13 +20,13 @@ func GetVideoFromSearch(query string, n int) (*Video, error) {
 	if err != nil {
 		return nil, err
 	}
-	if n <= 0 || n > len(*vs) {
+	if n <= 0 || n > len(vs) {
 		return nil, errors.New("no video found")
 	}
-	return &(*vs)[n-1], nil
+	return &(vs)[n-1], nil
 }
 
-func GetSearchResults(query string) (*[]Video, error) {
+func GetSearchResults(query string) ([]Video, error) {
 	params := url.Values{"search_query": []string{query}}.Encode()
 	res, err := GetRequest(YtURL + "results?" + params)
 	if err != nil {

cmd/ytgo/ui.go

@@ -5,13 +5,13 @@ import (
 	"github.com/rivo/tview"
 )
 
-func GetVideoFromMenu(vs *[]Video) (*Video, error) {
+func GetVideoFromMenu(vs []Video) (*Video, error) {
 	tview.Styles.PrimitiveBackgroundColor = tcell.ColorDefault
 	app := tview.NewApplication()
 	return getVideoFromList(app, vs)
 }
 
-func getVideoFromList(app *tview.Application, vs *[]Video) (*Video, error) {
+func getVideoFromList(app *tview.Application, vs []Video) (*Video, error) {
 	var selected *Video
 
 	list := tview.NewList()
@@ -27,7 +27,7 @@ func getVideoFromList(app *tview.Application, vs *[]Video) (*Video, error) {
 			app.Stop()
 		})
 
-	for i, v := range *vs {
+	for i, v := range vs {
 		list.AddItem(v.Title, v.Desc(), getShortcut(i), func() {
 			selected = &v
 			app.Stop()

cmd/ytgo/yt.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ergochat/readline"
 )
 
-const VERSION string = "v3.4.4"
+const VERSION string = "v3.4.5"
 
 const (
 	C_RED    string = "\x1b[31m"

cmd/ytgo/yt_test.go

@@ -103,7 +103,7 @@ func TestGetSearchResults(t *testing.T) {
 			if err != nil {
 				t.Error(err)
 			}
-			for _, v := range *v {
+			for _, v := range v {
 				testGottenVideo(&v, t)
 			}
 		}(q, t, &wg)