apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-06 08:27:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't require progress indicator at the very beginning of a line

Browse Source
This commit is contained in:
Ingo Oppermann
2025-01-08 16:08:21 +01:00
parent 591eaffbed
commit 09b3ce8dd7
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ffmpeg/parse/parser.go
View File

@@ -170,10 +170,10 @@ func New(config Config) Parser {
func (p *parser) Parse(line string) uint64 {
isDefaultProgress := strings.HasPrefix(line, "frame=")
isFFmpegInputs := strings.HasPrefix(line, "ffmpeg.inputs:")
isFFmpegOutputs := strings.HasPrefix(line, "ffmpeg.outputs:")
isFFmpegProgress := strings.HasPrefix(line, "ffmpeg.progress:")
isAVstreamProgress := strings.HasPrefix(line, "avstream.progress:")
isFFmpegInputs := strings.Contains(line, "ffmpeg.inputs:")
isFFmpegOutputs := strings.Contains(line, "ffmpeg.outputs:")
isFFmpegProgress := strings.Contains(line, "ffmpeg.progress:")
isAVstreamProgress := strings.Contains(line, "avstream.progress:")
if p.logStart.IsZero() {
p.lock.log.Lock()
@@ -195,7 +195,8 @@ func (p *parser) Parse(line string) uint64 {
}
if isFFmpegInputs {
if err := p.parseIO("input", strings.TrimPrefix(line, "ffmpeg.inputs:")); err != nil {
_, line, _ = strings.Cut(line, "ffmpeg.inputs:")
if err := p.parseIO("input", line); err != nil {
p.logger.WithFields(log.Fields{
"line": line,
"error": err,
@@ -206,7 +207,8 @@ func (p *parser) Parse(line string) uint64 {
}
if isFFmpegOutputs {
if err := p.parseIO("output", strings.TrimPrefix(line, "ffmpeg.outputs:")); err != nil {
_, line, _ = strings.Cut(line, "ffmpeg.outputs:")
if err := p.parseIO("output", line); err != nil {
p.logger.WithFields(log.Fields{
"line": line,
"error": err,
@@ -293,7 +295,8 @@ func (p *parser) Parse(line string) uint64 {
// Update the progress
if isAVstreamProgress {
if err := p.parseAVstreamProgress(strings.TrimPrefix(line, "avstream.progress:")); err != nil {
_, line, _ = strings.Cut(line, "avstream.progress:")
if err := p.parseAVstreamProgress(line); err != nil {
p.logger.WithFields(log.Fields{
"line": line,
"error": err,
@@ -312,7 +315,8 @@ func (p *parser) Parse(line string) uint64 {
return 0
}
} else if isFFmpegProgress {
if err := p.parseFFmpegProgress(strings.TrimPrefix(line, "ffmpeg.progress:")); err != nil {
_, line, _ = strings.Cut(line, "ffmpeg.progress:")
if err := p.parseFFmpegProgress(line); err != nil {
p.logger.WithFields(log.Fields{
"line": line,
"error": err,