Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix image thumbnail generation (#2524)

Browse Source 
* Better logging for thumbnail generation errors
* Reduce verbosity for thumbnail generation
* Provide stdin during thumbnail generation
This commit is contained in:
WithoutPants
2022-04-25 15:56:06 +10:00
committed by GitHub
parent 9e606feb76
commit 1b91937004
6 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/ffmpeg/generate.go
View File

@@ -5,6 +5,7 @@ import (
"context"
"errors"
"fmt"
"io"
"os/exec"
"strings"
)
@@ -35,8 +36,14 @@ func (f FFMpeg) Generate(ctx context.Context, args Args) error {
}
// GenerateOutput runs ffmpeg with the given args and returns it standard output.
func (f FFMpeg) GenerateOutput(ctx context.Context, args []string) ([]byte, error) {
func (f FFMpeg) GenerateOutput(ctx context.Context, args []string, stdin io.Reader) ([]byte, error) {
cmd := f.Command(ctx, args)
cmd.Stdin = stdin
return cmd.Output()
ret, err := cmd.Output()
if err != nil {
return nil, fmt.Errorf("error running ffmpeg command <%s>: %w", strings.Join(args, " "), err)
}
return ret, nil
}