Improve logging

This commit is contained in:
Carl Pearson
2024-10-04 05:20:25 -06:00
parent e2c44ca32a
commit 91ed7cbc0d
4 changed files with 39 additions and 57 deletions

View File

@@ -18,35 +18,40 @@ type FFProbeOutput struct {
// runs ffprobe with the provided args and returns (stdout, stderr, error)
func runFfprobe(args []string) ([]byte, []byte, error) {
ffprobe := "ffprobe"
fmt.Println(ffprobe, strings.Join(args, " "))
log.Infoln(ffprobe, strings.Join(args, " "))
cmd := exec.Command(ffprobe, args...)
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
fmt.Println("ffprobe error:", err, stdout.String(), stderr.String())
log.Errorf("ffprobe error: %v", err)
}
log.Infoln("stdout:", stdout.String())
log.Infoln("stderr:", stderr.String())
return stdout.Bytes(), stderr.Bytes(), err
}
func getAudioFormat(filename string) (string, error) {
output, _, err := runFfprobe([]string{"-v", "quiet", "-print_format", "json", "-show_streams", filename})
if err != nil {
return "", fmt.Errorf("ffprobe execution failed: %v", err)
log.Errorln("ffprobe error:", err)
return "", err
}
var ffprobeOutput FFProbeOutput
err = json.Unmarshal(output, &ffprobeOutput)
if err != nil {
return "", fmt.Errorf("failed to parse ffprobe output: %v", err)
log.Errorln("failed to parse ffprobe output:", err)
return "", err
}
numStreams := len(ffprobeOutput.Streams)
if numStreams > 1 || numStreams <= 0 {
return "", fmt.Errorf("%d streams in ffprobe output", numStreams)
log.Error(numStreams, "streams in ffprobe output", numStreams)
return "", err
}
return ffprobeOutput.Streams[0].CodecName, nil
@@ -62,14 +67,14 @@ func getStreamBitrate(path string, stream int) (uint, error) {
stdout, _, err := runFfprobe(ffprobeArgs)
if err != nil {
fmt.Println("getAudioBitrate error:", err, string(stdout))
fmt.Println("ffprobe error:", err, string(stdout))
return 0, err
}
bitrateStr := strings.TrimSpace(string(stdout))
bitrate, err := strconv.ParseUint(bitrateStr, 10, 32)
if err != nil {
fmt.Println("getAudioBitrate error:", err)
fmt.Println("parse bitrate error:", err)
return 0, err
}
return uint(bitrate), nil
@@ -84,14 +89,14 @@ func getFormatBitrate(path string) (uint, error) {
stdout, _, err := runFfprobe(ffprobeArgs)
if err != nil {
fmt.Println("getFormatBitrate error:", err, string(stdout))
fmt.Println("ffprobe error:", err, string(stdout))
return 0, err
}
bitrateStr := strings.TrimSpace(string(stdout))
bitrate, err := strconv.ParseUint(bitrateStr, 10, 32)
if err != nil {
fmt.Println("getFormatBitrate error:", err)
fmt.Println("parse bitrate error:", err)
return 0, err
}
return uint(bitrate), nil