added video duration in online music adder

evanhyd · Apr 24, 2023 · cb8405a · cb8405a
1 parent c88ac60
commit cb8405a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/source/scraper/Clipzag.go b/source/scraper/Clipzag.go
@@ -1,6 +1,7 @@
 package scraper
 
 import (
+	"fmt"
 	"html"
 	"io"
 	"log"
@@ -68,13 +69,11 @@ func parseSearchResult(parsed []string, result *ClipzagResult, completes chan st
 	staticImage.SetMinSize(resource.GetThumbnailIconSize())
 
 	*result = ClipzagResult{
-		videoID:      parsed[1][8:],
-		thumbnail:    staticImage,
-		duration:     parsed[3],
-		videoTitle:   html.UnescapeString(parsed[4]),
-		channelTitle: parsed[5],
-		stats:        parsed[6],
-		description:  parsed[7],
+		videoID:     parsed[1][8:],
+		thumbnail:   staticImage,
+		videoTitle:  html.UnescapeString(parsed[4]),
+		stats:       fmt.Sprintf("[%v] %v | %v", parsed[3], parsed[5], parsed[6]),
+		description: parsed[7],
 	}
 	completes <- struct{}{}
 }
diff --git a/source/scraper/ClipzagResult.go b/source/scraper/ClipzagResult.go
@@ -5,13 +5,11 @@ import (
 )
 
 type ClipzagResult struct {
-	videoID      string
-	thumbnail    *canvas.Image
-	duration     string
-	videoTitle   string
-	channelTitle string
-	stats        string
-	description  string
+	videoID     string
+	thumbnail   *canvas.Image
+	videoTitle  string
+	stats       string
+	description string
 }
 
 func (clipzagResult *ClipzagResult) VideoID() string {
@@ -22,18 +20,10 @@ func (clipzagResult *ClipzagResult) Thumbnail() *canvas.Image {
 	return clipzagResult.thumbnail
 }
 
-func (clipzagResult *ClipzagResult) Duration() string {
-	return clipzagResult.duration
-}
-
 func (clipzagResult *ClipzagResult) VideoTitle() string {
 	return clipzagResult.videoTitle
 }
 
-func (clipzagResult *ClipzagResult) ChannelTitle() string {
-	return clipzagResult.channelTitle
-}
-
 func (clipzagResult *ClipzagResult) Stats() string {
 	return clipzagResult.stats
 }

diff --git a/source/ui/MusicTabUI.go b/source/ui/MusicTabUI.go
@@ -152,8 +152,8 @@ func createAddOnlineDialog() dialog.Dialog {
 
 				videoTitle.Text = result.VideoTitle()
 
-				videoInfo := gridItems[1].(*widget.Label)
-				videoInfo.Text = result.ChannelTitle() + " | " + result.Stats()
+				videoStats := gridItems[1].(*widget.Label)
+				videoStats.Text = result.Stats()
 
 				description := gridItems[2].(*widget.Label)
 				description.Text = result.Description()