diff --git a/app.go b/app.go index f9db2fd..e5994bd 100644 --- a/app.go +++ b/app.go @@ -310,12 +310,12 @@ func parseConfig(cfg []Config) ParsedConfig { crf := find(cfg, "Constant Rate Factor (CRF)") return ParsedConfig{ - DeleteOldVideo: find(cfg, "Delete old video(s)?").FocusedOption != 0, - SkipEncodedVid: find(cfg, "What should we do about encoded videos?").FocusedOption == 0, - VideoEncoder: vEncoder.Opts[vEncoder.FocusedOption], - AudioEncoder: aEncoder.Opts[aEncoder.FocusedOption], - Preset: preset.Opts[preset.FocusedOption], - CRF: crf.Opts[crf.FocusedOption], + DeleteOldVideo: find(cfg, "Delete old video(s)?").FocusedOption != 0, + IgnoreConflictingName: find(cfg, "On name conflict?").FocusedOption == 0, + VideoEncoder: vEncoder.Opts[vEncoder.FocusedOption], + AudioEncoder: aEncoder.Opts[aEncoder.FocusedOption], + Preset: preset.Opts[preset.FocusedOption], + CRF: crf.Opts[crf.FocusedOption], } } diff --git a/cmds.go b/cmds.go index bc6a41d..1523a65 100644 --- a/cmds.go +++ b/cmds.go @@ -98,12 +98,12 @@ func (m *Model) parseConfig(dryRun bool) tea.Cmd { return parsedCfgMsg{ parsedConfig: ParsedConfig{ - DeleteOldVideo: find(m.Config, "Delete old video(s)?").FocusedOption != 0, - SkipEncodedVid: find(m.Config, "What should we do about encoded videos?").FocusedOption == 0, - VideoEncoder: vEncoder.Opts[vEncoder.FocusedOption], - AudioEncoder: aEncoder.Opts[aEncoder.FocusedOption], - Preset: preset.Opts[preset.FocusedOption], - CRF: crf.Opts[crf.FocusedOption], + DeleteOldVideo: find(m.Config, "Delete old video(s)?").FocusedOption != 0, + IgnoreConflictingName: find(m.Config, "On name conflict?").FocusedOption == 0, + VideoEncoder: vEncoder.Opts[vEncoder.FocusedOption], + AudioEncoder: aEncoder.Opts[aEncoder.FocusedOption], + Preset: preset.Opts[preset.FocusedOption], + CRF: crf.Opts[crf.FocusedOption], }, dryRun: dryRun, } diff --git a/config.go b/config.go index 6751cf3..2b5a0e1 100644 --- a/config.go +++ b/config.go @@ -18,7 +18,7 @@ var SupportedAudioEncoders = []string{ var Configs = []Config{ {Name: "Delete old video(s)?", Opts: []string{"No", "Yes"}, FocusedOption: 1}, - {Name: "What should we do about encoded videos?", Opts: []string{"Skip", "Delete and encode again"}}, + {Name: "On name conflict?", Opts: []string{"Ignore", "Overwrite"}}, {Name: "Video Encoder", Opts: []string{"copy"}}, {Name: "Audio Encoder", Opts: []string{"None", "copy"}, FocusedOption: 1}, {Name: "Preset", Opts: []string{"ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow"}, FocusedOption: 4}, @@ -32,12 +32,12 @@ type Config struct { } type ParsedConfig struct { - DeleteOldVideo bool - SkipEncodedVid bool - VideoEncoder string - AudioEncoder string - Preset string - CRF string + DeleteOldVideo bool + IgnoreConflictingName bool + VideoEncoder string + AudioEncoder string + Preset string + CRF string } func find(cfgs []Config, name string) Config { diff --git a/main.go b/main.go index 22bbf2d..c6e8659 100644 --- a/main.go +++ b/main.go @@ -135,7 +135,7 @@ func encode(fullFilePath string, fileName string, teaP *tea.Program, cfg ParsedC newFileFullPath := filepath.Join(parentDir, newFileName+fmt.Sprintf("_[%s]_[%s]", cfg.VideoEncoder, cfg.AudioEncoder)+extension) if _, err := os.Stat(newFileFullPath); err == nil { - if cfg.SkipEncodedVid { + if cfg.IgnoreConflictingName { log.Printf("Skipping \"%s\" because it already exists with the exact same encodings (crf and preset might be different though)", newFileFullPath) teaP.Send(finishedEncodingVideo{}) return