blankie
/
rimgo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for Range headers

This commit is contained in:
video-prize-ranch 2022-06-25 15:23:13 -04:00
parent 4bdcf9036d
commit d1a6768cef
No known key found for this signature in database
GPG Key ID: D8EAA4C5B12A7281
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pages/media.go
View File

@ -3,7 +3,6 @@ package pages
import ( import (
"net/http" "net/http"
"os" "os"
"strconv"
"strings" "strings"
"codeberg.org/video-prize-ranch/rimgo/utils" "codeberg.org/video-prize-ranch/rimgo/utils"
@ -27,7 +26,6 @@ func HandleUserAvatar(c *fiber.Ctx) error {
func handleMedia(c *fiber.Ctx, url string) error { func handleMedia(c *fiber.Ctx, url string) error {
utils.SetHeaders(c) utils.SetHeaders(c)
c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
if os.Getenv("FORCE_WEBP") == "1" && c.Query("no_webp") == "" && c.Accepts("image/webp") == "image/webp" { if os.Getenv("FORCE_WEBP") == "1" && c.Query("no_webp") == "" && c.Accepts("image/webp") == "image/webp" {
url = strings.ReplaceAll(url, ".png", ".webp") url = strings.ReplaceAll(url, ".png", ".webp")
@ -35,7 +33,16 @@ func handleMedia(c *fiber.Ctx, url string) error {
url = strings.ReplaceAll(url, ".jpeg", ".webp") url = strings.ReplaceAll(url, ".jpeg", ".webp")
} }
res, err := http.Get(url) req, err := http.NewRequest("GET", url, nil)
if err != nil {
return err
}
if c.Get("Range") != "" {
req.Header.Set("Range", c.Get("Range"))
}
res, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
return err return err
} }
@ -45,7 +52,12 @@ func handleMedia(c *fiber.Ctx, url string) error {
return c.Render("errors/404", nil) return c.Render("errors/404", nil)
} }
c.Set("Accept-Ranges", "bytes")
c.Set("Content-Type", res.Header.Get("Content-Type")); c.Set("Content-Type", res.Header.Get("Content-Type"));
contentLen, _ := strconv.Atoi(res.Header.Get("Content-Length")) c.Set("Content-Length", res.Header.Get("Content-Length"))
return c.SendStream(res.Body, contentLen) if res.Header.Get("Content-Range") != "" {
c.Set("Content-Range", res.Header.Get("Content-Range"))
}
return c.SendStream(res.Body)
} }