From fc4652ea8b3d380968977c12a38f8c0fbbe13806 Mon Sep 17 00:00:00 2001
From: Syed Ahkam <smahkam57@gmail.com>
Date: Mon, 21 Aug 2023 12:57:41 +0530
Subject: [PATCH] feat: better prompt handling + default values

---
 src/commands/create.rs | 45 ++++++++++++++++++++++++++++++------------
 src/utils.rs           | 19 +++++++++++-------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/commands/create.rs b/src/commands/create.rs
index 17681a8..bd165c9 100644
--- a/src/commands/create.rs
+++ b/src/commands/create.rs
@@ -100,11 +100,30 @@ fn post_create(args: Create) -> Result<()> {
 }
 
 fn ensure_valid_args(args: Create) -> Result<Create> {
-    let dest = args
-        .dest
-        .unwrap_or_else(|| prompt_for_input("Enter destination path").unwrap().into());
+    let safe_name = |name: String| name.to_lowercase().replace(" ", "_");
 
-    let dest_folder_name = dest.file_name().unwrap().to_str().unwrap().to_owned(); // FIXME: this could fail on non-unicode paths
+    let dest = args.dest.unwrap_or_else(|| {
+        prompt_for_input("Enter destination path", Some(".".into()))
+            .unwrap()
+            .into()
+    });
+
+    // Ensure dest exists
+    if !dest.exists() {
+        println!("doesnt exist");
+        std::fs::create_dir_all(&dest)?;
+    }
+
+    // Normalize or Canonicalize the path
+    let dest = dest.canonicalize()?;
+
+    let dest_folder_name = dest
+        .file_name()
+        .unwrap()
+        .to_str()
+        .map(|name| safe_name(name.into()))
+        .unwrap()
+        .to_owned();
 
     let sdk_path = args.sdk_path.unwrap_or_else(|| {
         std::env::var("ANDROID_SDK_ROOT")
@@ -112,19 +131,19 @@ fn ensure_valid_args(args: Create) -> Result<Create> {
             .unwrap()
     });
 
-    let project_name = args
-        .project_name
-        .unwrap_or(dest_folder_name) // defaults to dest folder name
-        .to_lowercase()
-        .replace(" ", "_"); // Perform some cleanup
+    let project_name = args.project_name.map(safe_name).unwrap_or_else(|| {
+        prompt_for_input("Enter project name", Some(safe_name(dest_folder_name))).unwrap()
+    });
 
     let app_name = args.name.unwrap_or_else(|| project_name.clone());
 
     let package_id = args.package_id.unwrap_or_else(|| {
-        prompt_for_input("Enter package identifier [example: com.example.demo]")
-            .unwrap()
-            .to_lowercase()
-            .replace(" ", "_")
+        prompt_for_input(
+            "Enter package identifier [suggested to customize]",
+            Some(format!("com.example.{}", project_name)),
+        )
+        .map(safe_name)
+        .unwrap()
     });
 
     Ok(Create {
diff --git a/src/utils.rs b/src/utils.rs
index 05c30fd..e1a9718 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -3,13 +3,18 @@
 use anyhow::{Context, Result};
 use which::which;
 
-pub fn prompt_for_input(prompt: &str) -> Result<String> {
-    Ok(
-        dialoguer::Input::<String>::with_theme(&dialoguer::theme::ColorfulTheme::default())
-            .with_prompt(prompt)
-            .interact_text()
-            .context("failed to prompt user")?,
-    )
+pub fn prompt_for_input(prompt: &str, default: Option<String>) -> Result<String> {
+    let theme = dialoguer::theme::ColorfulTheme::default();
+    let mut builder = dialoguer::Input::<String>::with_theme(&theme);
+
+    if let Some(default_value) = default {
+        builder.default(default_value);
+    }
+
+    Ok(builder
+        .with_prompt(prompt)
+        .interact_text()
+        .context("failed to prompt user")?)
 }
 
 pub fn find_gradle() -> Option<String> {