Fixes #58 - Auto increment for default name

src/commands/generate/mod.rs

@@ -1,5 +1,7 @@
+use std::ffi::OsString;
 use std::path::PathBuf;
 use std::process::Command;
+use std::{env, fs};
 
 use crate::commands::validate_worker_name;
 use crate::settings::toml::{Manifest, Site, TargetType};
@@ -13,8 +15,30 @@ pub fn generate(
 ) -> Result<(), failure::Error> {
     validate_worker_name(name)?;
 
-    log::info!("Generating a new worker project with name '{}'", name);
-    run_generate(name, template)?;
+    let dirname_exists = match directory_exists(name) {
+        Ok(val) => val,
+        Err(_) => true,
+    };
+
+    let new_name: String;
+
+    if dirname_exists {
+        new_name = match generate_name(name) {
+            Ok(val) => val,
+            Err(_) => {
+                log::debug!(
+                    "Failed to auto-increment name for a new worker project, using '{}'",
+                    name
+                );
+                String::from(name)
+            }
+        };
+    } else {
+        new_name = String::from(name);
+    }
+
+    log::info!("Generating a new worker project with name '{}'", new_name);
+    run_generate(&new_name, template)?;
 
     let config_path = PathBuf::from("./").join(&name);
     // TODO: this is tightly coupled to our site template. Need to remove once
@@ -24,7 +48,7 @@ pub fn generate(
     } else {
         None
     };
-    Manifest::generate(name.to_string(), target_type, &config_path, generated_site)?;
+    Manifest::generate(new_name, target_type, &config_path, generated_site)?;
 
     Ok(())
 }
@@ -37,10 +61,44 @@ pub fn run_generate(name: &str, template: &str) -> Result<(), failure::Error> {
 
     let command = command(binary_path, &args);
     let command_name = format!("{:?}", command);
-
     commands::run(command, &command_name)
 }
 
+fn generate_name(name: &str) -> Result<String, failure::Error> {
+    let mut num = 1;
+    let entry_names = read_current_dir()?;
+    let mut new_name = construct_name(&name, num);
+
+    while entry_names.contains(&OsString::from(&new_name)) {
+        num = num + 1;
+        new_name = construct_name(&name, num);
+    }
+    Ok(new_name)
+}
+
+fn read_current_dir() -> Result<Vec<OsString>, failure::Error> {
+    let current_dir = env::current_dir()?;
+    let mut entry_names = Vec::new();
+
+    for entry in fs::read_dir(current_dir)? {
+        let entry = entry?;
+        let path = entry.path();
+        if path.is_dir() {
+            entry_names.push(entry.file_name());
+        }
+    }
+    Ok(entry_names)
+}
+
+fn directory_exists(dirname: &str) -> Result<bool, failure::Error> {
+    let entry_names = read_current_dir()?;
+    Ok(entry_names.contains(&OsString::from(dirname)))
+}
+
+fn construct_name(name: &str, num: i32) -> String {
+    format!("{}-{}", name, num)
+}
+
 fn command(binary_path: PathBuf, args: &[&str]) -> Command {
     let mut c = if cfg!(target_os = "windows") {
         let mut c = Command::new("cmd");