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

Don't cache transcoded files if the request was cancelled (#2041)

Browse source 
* Don't cache transcoded files if the request was cancelled (or there was a transcoding error)

* Add context to logs

* Simplify Wait error handling

* Fix flaky test

* Change log level for "populating cache" error message

* Small cleanups
This commit is contained in:
Deluan Quintão 2022-12-18 12:22:12 -05:00 • committed by GitHub
parent 54395e7e6a
commit 24d520882e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 157 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

54
core/transcoder/transcoder.go
View file

@ -2,6 +2,8 @@ package transcoder
import (
"context"
"errors"
"fmt"
"io"
"os"
"os/exec"
@ -12,7 +14,7 @@ import (
)
type Transcoder interface {
Start(ctx context.Context, command, path string, maxBitRate int) (f io.ReadCloser, err error)
Start(ctx context.Context, command, path string, maxBitRate int) (io.ReadCloser, error)
}
func New() Transcoder {
@ -21,22 +23,54 @@ func New() Transcoder {
type externalTranscoder struct{}
func (e *externalTranscoder) Start(ctx context.Context, command, path string, maxBitRate int) (f io.ReadCloser, err error) {
func (e *externalTranscoder) Start(ctx context.Context, command, path string, maxBitRate int) (io.ReadCloser, error) {
args := createTranscodeCommand(command, path, maxBitRate)
log.Trace(ctx, "Executing transcoding command", "cmd", args)
cmd := exec.CommandContext(ctx, args[0], args[1:]...) // #nosec
j := &Cmd{ctx: ctx, args: args}
j.PipeReader, j.out = io.Pipe()
err := j.start()
if err != nil {
return nil, err
}
go j.wait()
return j, nil
}
type Cmd struct {
*io.PipeReader
out *io.PipeWriter
ctx context.Context
args []string
cmd *exec.Cmd
}
func (j *Cmd) start() error {
cmd := exec.CommandContext(j.ctx, j.args[0], j.args[1:]...) // #nosec
cmd.Stdout = j.out
cmd.Stderr = os.Stderr
if f, err = cmd.StdoutPipe(); err != nil {
j.cmd = cmd
if err := cmd.Start(); err != nil {
return fmt.Errorf("starting cmd: %w", err)
}
return nil
}
func (j *Cmd) wait() {
if err := j.cmd.Wait(); err != nil {
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
_ = j.out.CloseWithError(fmt.Errorf("%s exited with non-zero status code: %d", j.args[0], exitErr.ExitCode()))
} else {
_ = j.out.CloseWithError(fmt.Errorf("waiting %s cmd: %w", j.args[0], err))
}
return
}
if err = cmd.Start(); err != nil {
if j.ctx.Err() != nil {
_ = j.out.CloseWithError(j.ctx.Err())
return
}
go func() { _ = cmd.Wait() }() // prevent zombies
return
_ = j.out.Close()
}
// Path will always be an absolute path