Skip to content

Commit

Permalink
feat(cli): init cmd can now skip user interaction (DioxusLabs#2412)
Browse files Browse the repository at this point in the history
Previously only `dx new` had this ability, now `dx init` has it, too.
  • Loading branch information
Andrew15-5 authored and ASR-ASU committed May 21, 2024
1 parent 010c72c commit a0962c1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
6 changes: 3 additions & 3 deletions packages/cli/src/cli/create.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::*;
use cargo_generate::{GenerateArgs, TemplatePath};

static DEFAULT_TEMPLATE: &str = "gh:dioxuslabs/dioxus-template";
pub(crate) static DEFAULT_TEMPLATE: &str = "gh:dioxuslabs/dioxus-template";

#[derive(Clone, Debug, Default, Deserialize, Parser)]
#[clap(name = "new")]
Expand Down Expand Up @@ -34,6 +34,7 @@ impl Create {
subfolder: self.subtemplate,
..Default::default()
},
define: self.option,
..Default::default()
};
if self.yes {
Expand All @@ -43,9 +44,8 @@ impl Create {
);
}
args.silent = true;
};
}
args.name = self.name;
args.define = self.option;
let path = cargo_generate::generate(args)?;
post_create(&path)
}
Expand Down
28 changes: 22 additions & 6 deletions packages/cli/src/cli/init.rs
Original file line number Diff line number Diff line change
@@ -1,33 +1,49 @@
use super::*;
use crate::cli::create::DEFAULT_TEMPLATE;
use cargo_generate::{GenerateArgs, TemplatePath};

#[derive(Clone, Debug, Default, Deserialize, Parser)]
#[clap(name = "init")]
pub struct Init {
/// Template path
#[clap(default_value = "gh:dioxuslabs/dioxus-template", long)]
#[clap(default_value = DEFAULT_TEMPLATE, short, long)]
template: String,
/// Pass <option>=<value> for the used template (e.g., `foo=bar`)
#[clap(short, long)]
option: Vec<String>,
/// Specify a sub-template within the template repository to be used as the actual template
#[clap(long)]
subtemplate: Option<String>,
/// Skip user interaction by using the default values for the used template.
/// Default values can be overridden with `--option`
#[clap(short, long)]
yes: bool,
// TODO: turn on/off cargo-generate's output (now is invisible)
// #[clap(default_value = "false", short, long)]
// silent: bool,
}

impl Init {
pub fn init(self) -> Result<()> {
// get dir name
// Get directory name.
let name = std::env::current_dir()?
.file_name()
.map(|f| f.to_str().unwrap().to_string());

let args = GenerateArgs {
let mut args = GenerateArgs {
template_path: TemplatePath {
auto_path: Some(self.template),
subfolder: self.subtemplate,
..Default::default()
},
name,
init: true,
define: self.option,
..Default::default()
};

if self.yes {
args.silent = true;
}
let path = cargo_generate::generate(args)?;

create::post_create(&path)
}
}

0 comments on commit a0962c1

Please sign in to comment.