From 71aa6edd6723b7a5850f1bd57348991594e24611 Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@nadeko.net>
Date: Fri, 28 Mar 2025 02:03:53 -0300
Subject: [PATCH] fix: handling range headers correctly when full content
 requested

From: https://github.com/iv-org/invidious-companion/commit/71341b894cf5d8d02872975a9a8a4a10d0eed72f
---
 internal/paths/videoplayback.go | 51 +++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/internal/paths/videoplayback.go b/internal/paths/videoplayback.go
index 92d5233..2bb7e61 100644
--- a/internal/paths/videoplayback.go
+++ b/internal/paths/videoplayback.go
@@ -102,10 +102,19 @@ func Videoplayback(w http.ResponseWriter, req *http.Request) {
 	}
 
 	host := q.Get("host")
+	title := q.Get("title")
 	q.Del("host")
+	q.Del("title")
 
-	if req.Header.Get("Range") != "" {
-		q.Set("range", strings.Split(req.Header.Get("Range"), "=")[1])
+	rangeHeader := req.Header.Get("range")
+	var requestBytes string
+	if rangeHeader != "" {
+		requestBytes = strings.Split(rangeHeader, "=")[1]
+	} else {
+		requestBytes = ""
+	}
+	if requestBytes != "" {
+		q.Set("range", requestBytes)
 	}
 
 	path := req.URL.EscapedPath()
@@ -162,7 +171,43 @@ func Videoplayback(w http.ResponseWriter, req *http.Request) {
 
 	utils.CopyHeadersNew(resp.Header, w.Header())
 
-	w.WriteHeader(resp.StatusCode)
+	if title != "" {
+		content := "attachment; filename=\"" + url.PathEscape(title) + "\"; filename*=UTF-8''" + url.PathEscape(title)
+		w.Header().Set("content-disposition", content)
+	}
+
+	if requestBytes != "" && resp.StatusCode == http.StatusOK {
+		// check for range headers in the forms:
+		// "bytes=0-" get full length from start
+		// "bytes=500-" get full length from 500 bytes in
+		// "bytes=500-1000" get 500 bytes starting from 500
+		byteParts := strings.Split(requestBytes, "-")
+		firstByte, lastByte := byteParts[0], byteParts[1]
+		fmt.Println(byteParts)
+		if lastByte != "" {
+			w.Header().Add("content-range", "bytes "+requestBytes+"/*")
+			w.WriteHeader(206)
+		} else {
+			fmt.Println("nolastbyte")
+			// i.e. "bytes=0-", "bytes=600-"
+			// full size of content is able to be calculated, so a full Content-Range header can be constructed
+			bytesReceived := resp.Header.Get("content-length")
+			firstByteInt, _ := strconv.Atoi(firstByte)
+			bytesReceivedInt, _ := strconv.Atoi(bytesReceived)
+			// last byte should always be one less than the length
+			totalContentLength := firstByteInt + bytesReceivedInt
+			lastByte := totalContentLength - 1
+			lastByteString := strconv.Itoa(lastByte)
+			totalContentLengthString := strconv.Itoa(totalContentLength)
+			w.Header().Add("content-range", "bytes "+firstByte+"-"+lastByteString+"/"+totalContentLengthString)
+			if firstByte != "0" {
+				// only part of the total content returned, 206
+				w.WriteHeader(206)
+			}
+		}
+	}
+
+	// w.WriteHeader(resp.StatusCode)
 
 	if req.Method == "GET" && (resp.Header.Get("Content-Type") == "application/x-mpegurl" || resp.Header.Get("Content-Type") == "application/vnd.apple.mpegurl") {
 		bytes, err := io.ReadAll(resp.Body)