Skip to content

Commit 78fceef

Browse files
committed
[summary] Print Extra Input and Output parameters
1 parent 620b292 commit 78fceef

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

markut.go

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ type EvalContext struct {
152152
AudioCodec *Token
153153
AudioBitrate *Token
154154

155-
ExtraOutFlags []string
156-
ExtraInFlags []string
155+
ExtraOutFlags []Token
156+
ExtraInFlags []Token
157157
}
158158

159159
const (
@@ -186,7 +186,6 @@ func defaultContext() (EvalContext, bool) {
186186
}
187187

188188
func (context EvalContext) PrintSummary() error {
189-
// TODO: Print Extra Input and Output parameters and where they were defined
190189
fmt.Printf(">>> Main Output Parameters:\n")
191190
if context.VideoCodec != nil {
192191
fmt.Printf("Video Codec: %s (Defined at %s)\n", string(context.VideoCodec.Text), context.VideoCodec.Loc);
@@ -209,6 +208,21 @@ func (context EvalContext) PrintSummary() error {
209208
fmt.Printf("Audio Bitrate: %s (Default)\n", DefaultAudioBitrate);
210209
}
211210
fmt.Println()
211+
// TODO: merge together parameters defined on the same line
212+
if len(context.ExtraInFlags) > 0 {
213+
fmt.Printf(">>> Extra Input Parameters:\n")
214+
for _, inFlag := range context.ExtraInFlags {
215+
fmt.Printf("%s: %s\n", inFlag.Loc, string(inFlag.Text));
216+
}
217+
fmt.Println()
218+
}
219+
if len(context.ExtraOutFlags) > 0 {
220+
fmt.Printf(">>> Extra Output Parameters:\n")
221+
for _, outFlag := range context.ExtraOutFlags {
222+
fmt.Printf("%s: %s\n", outFlag.Loc, string(outFlag.Text));
223+
}
224+
fmt.Println()
225+
}
212226
TwitchVodFileRegexp := "([0-9]+)-[0-9a-f\\-]+\\.mp4"
213227
re := regexp.MustCompile(TwitchVodFileRegexp)
214228
fmt.Printf(">>> Twitch Chat Logs (Detected by regex `%s`)\n", TwitchVodFileRegexp)
@@ -523,7 +537,7 @@ func ffmpegCutChunk(context EvalContext, chunk Chunk) error {
523537

524538
args = append(args, "-ss", millisToSecsForFFmpeg(chunk.Start))
525539
for _, inFlag := range context.ExtraInFlags {
526-
args = append(args, inFlag)
540+
args = append(args, string(inFlag.Text))
527541
}
528542
args = append(args, "-i", chunk.InputPath)
529543

@@ -552,7 +566,7 @@ func ffmpegCutChunk(context EvalContext, chunk Chunk) error {
552566
args = append(args, "-vf", "boxblur=50:5")
553567
}
554568
for _, outFlag := range context.ExtraOutFlags {
555-
args = append(args, outFlag)
569+
args = append(args, string(outFlag.Text))
556570
}
557571
unfinishedChunkName := "unfinished-chunk.mp4"
558572
args = append(args, unfinishedChunkName)
@@ -1498,7 +1512,7 @@ func main() {
14981512
return false
14991513
}
15001514
outFlag := args[0]
1501-
context.ExtraOutFlags = append(context.ExtraOutFlags, string(outFlag.Text))
1515+
context.ExtraOutFlags = append(context.ExtraOutFlags, outFlag)
15021516
return true;
15031517
},
15041518
},
@@ -1514,7 +1528,7 @@ func main() {
15141528
return false
15151529
}
15161530
inFlag := args[0]
1517-
context.ExtraInFlags = append(context.ExtraInFlags, string(inFlag.Text))
1531+
context.ExtraInFlags = append(context.ExtraInFlags, inFlag)
15181532
return true;
15191533
},
15201534
},

0 commit comments

Comments
 (0)