fix: cli file collision resolution in non-interactive settings (#1381)

fixes program not using on_conflict when terminal non-interactive
flxzt · Mar 6, 2025 · 119e951 · 119e951
1 parent 0fcb985
commit 119e951
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/crates/rnote-cli/src/export.rs b/crates/rnote-cli/src/export.rs
@@ -433,12 +433,6 @@ pub(crate) fn file_conflict_prompt_action(
     if !output_file.exists() {
         return Ok(None);
     }
-    if !io::stdout().is_terminal() {
-        return Err(anyhow::anyhow!(
-            "File conflict for file \"{}\" detected and terminal is not interactive. Option \"--on-conflict\" needs to be supplied.",
-            output_file.display()
-        ));
-    }
     match on_conflict_overwrite {
         Some(o) => on_conflict = *o,
         None => {
@@ -452,6 +446,12 @@ pub(crate) fn file_conflict_prompt_action(
                 OnConflict::AlwaysSuffix,
             ];
             while matches!(on_conflict, OnConflict::Ask) {
+                if !io::stdout().is_terminal() {
+                    return Err(anyhow::anyhow!(
+                        "File conflict for file \"{}\" detected and terminal is not interactive. Option \"--on-conflict\" needs to be supplied.",
+                        output_file.display()
+                    ));
+                }
                 match dialoguer::Select::new()
                     .with_prompt(format!(
                         "File \"{}\" already exists:",