feat ✨: hotfix proxying invidious apicalls, refacto search functions

Signed-off-by: Victor Hang <[email protected]>
Banh-Canh · Oct 1, 2024 · 2ba47b7 · 2ba47b7
1 parent 8b0f3f4
commit 2ba47b7
Show file tree

Hide file tree

Showing 7 changed files with 178 additions and 153 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -16,7 +16,7 @@ builds:
       - arm64
       - arm
     ldflags:
-      - -s -w -X github.com/Banh-Canh/ytui/cmd.version=v{{.Version}}
+      - -s -w -X github.com/Banh-Canh/ytui/cmd.version=v{{- .Version }}
 archives:
   - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of `uname`.

diff --git a/cmd/query_history.go b/cmd/query_history.go
@@ -51,7 +51,7 @@ will be stored in there.`,
 			os.Exit(0)
 		}
 		utils.Logger.Info("Videos found in history.", zap.Int("video_count", len(result)))
-		selectedVideo, err := youtube.YoutubeResultMenu(result)
+		selectedVideo, err := youtube.YoutubeResultMenu(result, viper.GetString("invidious.proxy"))
 		if err != nil {
 			utils.Logger.Info("FZF menu closed.")
 			os.Exit(0)

diff --git a/cmd/query_search.go b/cmd/query_search.go
@@ -58,7 +58,7 @@ Press enter to run any of the videos.`,
 		}
 
 		utils.Logger.Info("Videos found.", zap.Int("video_count", len(*result)))
-		selectedVideo, err := youtube.YoutubeResultMenu(*result)
+		selectedVideo, err := youtube.YoutubeResultMenu(*result, viper.GetString("invidious.proxy"))
 		if err != nil {
 			utils.Logger.Info("FZF menu closed.")
 			os.Exit(0)

diff --git a/cmd/query_subscribed.go b/cmd/query_subscribed.go
@@ -70,7 +70,7 @@ It will also only pick from the 50 most relevants subscribed channels in your Yo
 			}
 		}
 		utils.Logger.Info("Retrieved videos from subscribed channels.", zap.Int("video_count", len(*result)))
-		selectedVideo, err := youtube.YoutubeResultMenu(*result)
+		selectedVideo, err := youtube.YoutubeResultMenu(*result, viper.GetString("invidious.proxy"))
 		if err != nil {
 			utils.Logger.Info("FZF menu closed.")
 			os.Exit(0)

diff --git a/cmd/show_suscribed.go b/cmd/show_suscribed.go
@@ -66,7 +66,7 @@ It will also only pick from the 50 most relevants subscribed channels in your Yo
 			channelList = viper.GetStringSlice("channels.subscribed")
 			utils.Logger.Info("Retrieved local subscribed channels.", zap.Int("channel_count", len(channelList)))
 		}
-		channels, err := youtube.GetAllChannelsInfo(channelList)
+		channels, err := youtube.GetAllChannelsInfo(channelList, viper.GetString("invidious.proxy"))
 		if err != nil {
 			utils.Logger.Fatal("Failed to get all channels data.", zap.Error(err))
 			os.Exit(1)

diff --git a/pkg/youtube/fzf.go b/pkg/youtube/fzf.go
@@ -17,6 +17,7 @@ func fetchDescriptionsInBackground(
 	videoData []SearchResultItem,
 	descriptionCache map[string]string,
 	cacheLock *sync.RWMutex,
+	proxyURLString string,
 ) {
 	go func() {
 		for {
@@ -40,7 +41,7 @@ func fetchDescriptionsInBackground(
 				}
 
 				// Fetch the video description with retries
-				if err := fetchAndCacheDescription(video, descriptionCache, cacheLock); err != nil {
+				if err := fetchAndCacheDescription(video, descriptionCache, cacheLock, proxyURLString); err != nil {
 					utils.Logger.Error("Failed to fetch description.", zap.Error(err))
 					continue
 				}
@@ -73,9 +74,14 @@ func cleanDescription(description string) string {
 }
 
 // Fetches a single video description and stores it in cache.
-func fetchAndCacheDescription(video SearchResultItem, descriptionCache map[string]string, cacheLock *sync.RWMutex) error {
+func fetchAndCacheDescription(
+	video SearchResultItem,
+	descriptionCache map[string]string,
+	cacheLock *sync.RWMutex,
+	proxyURLString string,
+) error {
 	for {
-		videoInfo, err := SearchVideoInfo(video.VideoID)
+		videoInfo, err := SearchVideoInfo(video.VideoID, proxyURLString)
 		if err != nil {
 			utils.Logger.Info("Fetching description failed. Retrying...", zap.String("videoTitle", video.Title), zap.Error(err))
 		}
@@ -139,13 +145,13 @@ func getVideoPreview(video SearchResultItem, descriptionCache map[string]string,
 }
 
 // Handles the interactive menu for video selection. Powered by fzf-like
-func YoutubeResultMenu(videoData []SearchResultItem) (SearchResultItem, error) {
+func YoutubeResultMenu(videoData []SearchResultItem, proxyURLString string) (SearchResultItem, error) {
 	// Cache to store video descriptions
 	descriptionCache := make(map[string]string)
 	cacheLock := sync.RWMutex{} // For thread-safe cache access
 
 	// Start background fetching of descriptions
-	fetchDescriptionsInBackground(videoData, descriptionCache, &cacheLock)
+	fetchDescriptionsInBackground(videoData, descriptionCache, &cacheLock, proxyURLString)
 
 	utils.Logger.Info("Opening search menu.")
 	idx, err := fuzzyfinder.Find(