fix(cli.rs): do not prompt for init values if arg set (#3400)

Author: lucasfernog

.changes/fix-cli-prompts.md

@@ -0,0 +1,5 @@
+---
+"cli.rs": patch
+---
+
+Fix `init` command prompting for values even if the argument has been provided on the command line.

tooling/cli/src/init.rs

@@ -90,29 +90,35 @@ impl Options {
       Default::default()
     };
 
-    self.app_name = self.app_name.or(request_input(
-      "What is your app name?",
-      init_defaults.app_name.clone(),
-      self.ci,
-    )?);
-
-    self.window_title = self.window_title.or(request_input(
-      "What should the window title be?",
-      init_defaults.app_name.clone(),
-      self.ci,
-    )?);
-
-    self.dist_dir = self.dist_dir
-                .or(request_input(
-                    r#"Where are your web assets (HTML/CSS/JS) located, relative to the "<current dir>/src-tauri/tauri.conf.json" file that will be created?"#,
-                    init_defaults.framework.as_ref().map(|f| f.dist_dir()),
-                    self.ci)?);
-
-    self.dev_path = self.dev_path.or(request_input(
-      "What is the url of your dev server?",
-      init_defaults.framework.map(|f| f.dev_path()),
-      self.ci,
-    )?);
+    self.app_name = self.app_name.map(|s| Ok(Some(s))).unwrap_or_else(|| {
+      request_input(
+        "What is your app name?",
+        init_defaults.app_name.clone(),
+        self.ci,
+      )
+    })?;
+
+    self.window_title = self.window_title.map(|s| Ok(Some(s))).unwrap_or_else(|| {
+      request_input(
+        "What should the window title be?",
+        init_defaults.app_name.clone(),
+        self.ci,
+      )
+    })?;
+
+    self.dist_dir = self.dist_dir.map(|s| Ok(Some(s))).unwrap_or_else(|| request_input(
+      r#"Where are your web assets (HTML/CSS/JS) located, relative to the "<current dir>/src-tauri/tauri.conf.json" file that will be created?"#,
+      init_defaults.framework.as_ref().map(|f| f.dist_dir()),
+      self.ci
+    ))?;
+
+    self.dev_path = self.dev_path.map(|s| Ok(Some(s))).unwrap_or_else(|| {
+      request_input(
+        "What is the url of your dev server?",
+        init_defaults.framework.map(|f| f.dev_path()),
+        self.ci,
+      )
+    })?;
 
     Ok(self)
   }