From f960f197145d3f45115e692c853b8a82af171aad Mon Sep 17 00:00:00 2001
From: Bogdan Brinza <Bogdan.Brinza@hey.com>
Date: Sun, 30 Jun 2024 22:36:27 -0700
Subject: [PATCH] Adding a Favorites list section

---
 rest/templates/list.gohtml          | 132 +++++++++++++++-------------
 rest/view_models/list_view_model.go |  18 ++++
 2 files changed, 90 insertions(+), 60 deletions(-)

diff --git a/rest/templates/list.gohtml b/rest/templates/list.gohtml
index d0caa8e..212308b 100644
--- a/rest/templates/list.gohtml
+++ b/rest/templates/list.gohtml
@@ -47,66 +47,78 @@
 
     <section class="watchlist_container">
 
-    {{if .Continue}}
-        <details open>
-            <summary>{{template "plus_icon"}}<h1>Continue</h1></summary>
-            <ul class="videos resp-grid">
-            {{range .Continue}}
-                <li>{{template "video" .}}</li>
-            {{end}}
-            </ul>
-        </details>
-    {{end}}
-
-    {{if .Videos}}
-        <details>
-            <summary>{{template "plus_icon"}}<h1>Videos</h1></summary>
-            <ul class="videos resp-grid">
-            {{range .Videos}}
-                <li>{{template "video" .}}</li>
-            {{end}}
-            </ul>
-        </details>
-    {{end}}
-
-    {{if .Playlists}}
-        <details>
-            <summary>{{template "plus_icon"}}<h1>Playlists</h1></summary>
-            <section class="playlists_container">
-            {{$playlists := .Playlists}}
-            {{range $ii, $playlistSection := .PlaylistsOrder}}
-                <details {{if eq $ii 0}}open{{end}}>
-                    <summary class="h2 {{$playlistSection}}">{{template "plus_icon"}}<h2>{{$playlistSection}}</h2></summary>
-                    <ul class='playlists resp-grid'>
-                        {{$playlist := index $playlists $playlistSection}}
-                        {{range $playlist}}
-                            {{template "playlist" .}}
-                        {{end}}
-                    </ul>
-                </details>
-            {{end}}
-            </section>
-        </details>
-
-    {{end}}
-
-    {{if .Downloads}}
-        <details>
-            <summary>{{template "plus_icon"}}<h1>Downloads</h1></summary>
-            <ul class="videos resp-grid">
-            {{range .Downloads}}
-                <li>{{template "video" .}}</li>
-            {{end}}
-            </ul>
-        </details>
-    {{end}}
-
-    {{if .HasHistory}}
-        <details open>
-            <summary>{{template "plus_icon"}}<h1>History</h1></summary>
-            <a class='link' href='/history'>Check out your watch history</a>
-        </details>
-    {{end}}
+        {{if .Continue}}
+            <details open>
+                <summary>{{template "plus_icon"}}<h1>Continue</h1></summary>
+                <ul class="videos resp-grid">
+                    {{range .Continue}}
+                        <li>{{template "video" .}}</li>
+                    {{end}}
+                </ul>
+            </details>
+        {{end}}
+
+        {{if .Videos}}
+            <details>
+                <summary>{{template "plus_icon"}}<h1>Videos</h1></summary>
+                <ul class="videos resp-grid">
+                    {{range .Videos}}
+                        <li>{{template "video" .}}</li>
+                    {{end}}
+                </ul>
+            </details>
+        {{end}}
+
+        {{if .Playlists}}
+            <details>
+                <summary>{{template "plus_icon"}}<h1>Playlists</h1></summary>
+                <section class="playlists_container">
+                    {{$playlists := .Playlists}}
+                    {{range $ii, $playlistSection := .PlaylistsOrder}}
+                        <details {{if eq $ii 0}}open{{end}}>
+                            <summary class="h2 {{$playlistSection}}">{{template "plus_icon"}}
+                                <h2>{{$playlistSection}}</h2></summary>
+                            <ul class='playlists resp-grid'>
+                                {{$playlist := index $playlists $playlistSection}}
+                                {{range $playlist}}
+                                    {{template "playlist" .}}
+                                {{end}}
+                            </ul>
+                        </details>
+                    {{end}}
+                </section>
+            </details>
+
+        {{end}}
+
+        {{if .Downloads}}
+            <details>
+                <summary>{{template "plus_icon"}}<h1>Downloads</h1></summary>
+                <ul class="videos resp-grid">
+                    {{range .Downloads}}
+                        <li>{{template "video" .}}</li>
+                    {{end}}
+                </ul>
+            </details>
+        {{end}}
+
+        {{if .Favorites}}
+            <details>
+                <summary>{{template "plus_icon"}}<h1>Favorites</h1></summary>
+                <ul class="videos resp-grid">
+                    {{range .Favorites}}
+                        <li>{{template "video" .}}</li>
+                    {{end}}
+                </ul>
+            </details>
+        {{end}}
+
+        {{if .HasHistory}}
+            <details open>
+                <summary>{{template "plus_icon"}}<h1>History</h1></summary>
+                <a class='link' href='/history'>Check out your watch history</a>
+            </details>
+        {{end}}
 
     </section>
 
diff --git a/rest/view_models/list_view_model.go b/rest/view_models/list_view_model.go
index 29b666b..464ffd1 100644
--- a/rest/view_models/list_view_model.go
+++ b/rest/view_models/list_view_model.go
@@ -12,6 +12,7 @@ type ListViewModel struct {
 	Downloads      []*VideoViewModel
 	PlaylistsOrder []string
 	Playlists      map[string][]*PlaylistViewModel
+	Favorites      []*VideoViewModel
 	HasHistory     bool
 }
 
@@ -52,6 +53,7 @@ func GetListViewModel(rdx kvas.ReadableRedux) (*ListViewModel, error) {
 	// videos is all downloaded videos that are not:
 	// - in history (ended)
 	// - in continue (have progress)
+	// - is favorite
 	// - in any auto-refreshing playlist
 	dcKeys := rdx.Keys(data.VideoDownloadCompletedProperty)
 	if len(dcKeys) > 0 {
@@ -66,6 +68,9 @@ func GetListViewModel(rdx kvas.ReadableRedux) (*ListViewModel, error) {
 			if rdx.HasKey(data.VideoProgressProperty, id) {
 				continue
 			}
+			if rdx.HasKey(data.VideoFavoriteProperty, id) {
+				continue
+			}
 
 			skip := false
 			for _, playlistId := range rdx.Keys(data.PlaylistAutoRefreshProperty) {
@@ -159,6 +164,19 @@ func GetListViewModel(rdx kvas.ReadableRedux) (*ListViewModel, error) {
 		}
 	}
 
+	fvKeys := rdx.Keys(data.VideoFavoriteProperty)
+	fvKeys, err = rdx.Sort(fvKeys, false, data.VideoTitleProperty)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, id := range fvKeys {
+		lvm.Favorites = append(lvm.Favorites, GetVideoViewModel(id, rdx,
+			ShowPoster,
+			ShowDuration,
+			ShowPublishedDate))
+	}
+
 	lvm.HasHistory = len(rdx.Keys(data.VideoEndedDateProperty)) > 0
 
 	return lvm, nil