mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-05 05:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Small changes to stream.view endpoint

Browse source 
Always send content-length header
This commit is contained in:
Deluan 2016-03-06 20:42:22 -05:00
parent 78ed8bd4d9
commit 76deb2f5bb
2 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/stream.go
View file

@ -46,9 +46,11 @@ func (c *StreamController) Stream() {
beego.Debug("Streaming file", c.id, ":", c.mf.Path)
beego.Debug("Bitrate", c.mf.BitRate, "MaxBitRate", maxBitRate)
contentLength := c.mf.Size
if maxBitRate > 0 {
c.Ctx.Output.Header("Content-Length", strconv.Itoa((c.mf.Duration+1)*maxBitRate*1000/8))
contentLength = strconv.Itoa((c.mf.Duration + 1) * maxBitRate * 1000 / 8)
}
c.Ctx.Output.Header("Content-Length", contentLength)
c.Ctx.Output.Header("Content-Type", "audio/mpeg")
c.Ctx.Output.Header("Expires", "0")
c.Ctx.Output.Header("Cache-Control", "must-revalidate")

47
stream/downsampling.go
View file

@ -9,33 +9,36 @@ import (
"strings"
)
// TODO Encapsulate as a io.Reader
func Stream(path string, bitRate int, maxBitRate int, w io.Writer) error {
var f io.Reader
var err error
if maxBitRate > 0 && bitRate > maxBitRate {
cmdLine, args := createDownsamplingCommand(path, maxBitRate)
beego.Debug("Executing cmd:", cmdLine, args)
cmd := exec.Command(cmdLine, args...)
cmd.Stderr = os.Stderr
stdout, err := cmd.StdoutPipe()
if err != nil {
beego.Error("Error executing", cmdLine, ":", err)
return err
}
if err = cmd.Start(); err != nil {
beego.Error("Error executing", cmdLine, ":", err)
} else {
_, err = io.Copy(w, stdout)
}
return err
f, err = downsample(path, maxBitRate)
} else {
f, err := os.Open(path)
if err != nil {
beego.Error("Error opening file", path, ":", err)
return err
}
_, err = io.Copy(w, f)
f, err = os.Open(path)
}
if err != nil {
beego.Error("Error opening file", path, ":", err)
return err
}
if _, err = io.Copy(w, f); err != nil {
beego.Error("Error copying file", path, ":", err)
return err
}
return err
}
func downsample(path string, maxBitRate int) (f io.Reader, err error) {
cmdLine, args := createDownsamplingCommand(path, maxBitRate)
beego.Debug("Executing cmd:", cmdLine, args)
cmd := exec.Command(cmdLine, args...)
cmd.Stderr = os.Stderr
if f, err = cmd.StdoutPipe(); err != nil {
return f, err
}
return f, cmd.Start()
}
func createDownsamplingCommand(path string, maxBitRate int) (string, []string) {