only cache the better format (again)

birabittoh · Jan 13, 2024 · 0c53037 · 0c53037
1 parent 50c43a7
commit 0c53037
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 50 deletions.
diff --git a/invidious/api.go b/invidious/api.go
@@ -47,6 +47,14 @@ func (c *Client) fetchVideo(videoId string) (*Video, int) {
 		return nil, http.StatusInternalServerError
 	}
 	res.Expire = time.Unix(expireTimestamp, 0)
+
+	_, l, i := c.findCompatibleFormat(res)
+	if l == 0 {
+		logger.Warn("No compatible formats found for video.")
+		res.Url = ""
+	}
+
+	res.Url = res.Formats[i].Url
 	return res, http.StatusOK
 }
 

diff --git a/invidious/cache.go b/invidious/cache.go
@@ -46,26 +46,12 @@ func CacheVideoDB(v Video) error {
 	}
 	defer cacheVideo.Close()
 
-	_, err = cacheVideo.Exec(v.VideoId, v.Title, v.Description, v.Uploader, v.Duration, v.Expire)
+	_, err = cacheVideo.Exec(v.VideoId, v.Title, v.Description, v.Uploader, v.Duration, v.Url, v.Expire)
 	if err != nil {
 		logger.Error("Could not cache video: ", err)
 		return err
 	}
 
-	for _, f := range v.Formats {
-		cacheFormat, err := db.Prepare(cacheFormatQuery)
-		if err != nil {
-			logger.Error("Could not cache format: ", err)
-			return err
-		}
-		defer cacheVideo.Close()
-
-		_, err = cacheFormat.Exec(v.VideoId, f.Name, f.Height, f.Width, f.Url)
-		if err != nil {
-			logger.Error("Could not cache format: ", err)
-			return err
-		}
-	}
 	return nil
 }
 
@@ -81,7 +67,7 @@ func GetVideoDB(videoId string) (*Video, error) {
 	defer getVideo.Close()
 
 	v := &Video{}
-	err = getVideo.QueryRow(videoId).Scan(&v.VideoId, &v.Title, &v.Description, &v.Uploader, &v.Duration, &v.Timestamp, &v.Expire)
+	err = getVideo.QueryRow(videoId).Scan(&v.VideoId, &v.Title, &v.Description, &v.Uploader, &v.Duration, &v.Url, &v.Timestamp, &v.Expire)
 	if err != nil {
 		logger.Debug("Could not get video:", err)
 		return nil, err
@@ -92,30 +78,6 @@ func GetVideoDB(videoId string) (*Video, error) {
 		return nil, fmt.Errorf("expired")
 	}
 
-	getFormat, err := db.Prepare(getFormatQuery)
-	if err != nil {
-		logger.Error("Could not get format: ", err)
-		return nil, err
-	}
-	defer getFormat.Close()
-
-	response, err := getFormat.Query(videoId)
-	if err != nil {
-		logger.Error("Could not get formats: ", err)
-		return nil, err
-	}
-	defer response.Close()
-
-	for response.Next() {
-		f := Format{}
-		err := response.Scan(&f.VideoId, &f.Name, &f.Height, &f.Width, &f.Url)
-		if err != nil {
-			logger.Error("Could not get formats: ", err)
-			return nil, err
-		}
-		v.Formats = append(v.Formats, f)
-	}
-
 	return v, nil
 }
 

diff --git a/invidious/invidious.go b/invidious/invidious.go
@@ -29,10 +29,7 @@ type Client struct {
 }
 
 type Format struct {
-	VideoId   string
 	Name      string `json:"qualityLabel"`
-	Height    int
-	Width     int
 	Url       string `json:"url"`
 	Container string `json:"container"`
 	Size      string `json:"size"`
@@ -47,6 +44,7 @@ type Video struct {
 	Formats     []Format `json:"formatStreams"`
 	Timestamp   time.Time
 	Expire      time.Time
+	Url         string
 }
 
 func filter[T any](ss []T, test func(T) bool) (ret []T) {

diff --git a/invidious/proxy.go b/invidious/proxy.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 )
 
-func (c *Client) proxyUrl(url string) (*bytes.Buffer, int64, int) {
+func (c *Client) urlToBuffer(url string) (*bytes.Buffer, int64, int) {
 	req, err := http.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		logger.Error(err) // bad request
@@ -43,11 +43,11 @@ func (c *Client) proxyUrl(url string) (*bytes.Buffer, int64, int) {
 	return b, l, http.StatusOK
 }
 
-func (c *Client) proxyVideo(video *Video) (*bytes.Buffer, int64, int) {
+func (c *Client) findCompatibleFormat(video *Video) (*bytes.Buffer, int64, int) {
 	for i := len(video.Formats) - 1; i >= 0; i-- {
 		url := video.Formats[i].Url
 		logger.Debug(url)
-		b, l, httpStatus := c.proxyUrl(url)
+		b, l, httpStatus := c.urlToBuffer(url)
 		if httpStatus == http.StatusOK {
 			return b, l, i
 		}
@@ -63,5 +63,5 @@ func (c *Client) ProxyVideoId(videoId string) (*bytes.Buffer, int64, int) {
 		return nil, 0, http.StatusBadRequest
 	}
 
-	return c.proxyVideo(video)
+	return c.urlToBuffer(video.Url)
 }
diff --git a/invidious/queries.go b/invidious/queries.go
@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS videos (
     description TEXT NOT NULL,
     uploader TEXT NOT NULL,
     duration int NOT NULL,
+    url TEXT NOT NULL,
     timestamp DATETIME DEFAULT (datetime('now')),
     expire DATETIME NOT NULL
 );`
@@ -23,9 +24,7 @@ CREATE TABLE IF NOT EXISTS formats (
 );`
 
 const getVideoQuery = "SELECT * FROM videos WHERE videoId = (?);"
-const getFormatQuery = "SELECT * FROM formats WHERE videoId = (?)"
 
-const cacheVideoQuery = "INSERT OR REPLACE INTO videos (videoId, title, description, uploader, duration, expire) VALUES (?, ?, ?, ?, ?, ?);"
-const cacheFormatQuery = "INSERT OR REPLACE INTO formats (videoId, name, height, width, url) VALUES (?, ?, ?, ?, ?);"
+const cacheVideoQuery = "INSERT OR REPLACE INTO videos (videoId, title, description, uploader, duration, url, expire) VALUES (?, ?, ?, ?, ?, ?, ?);"
 
 const clearQuery = "DELETE FROM videos;"