Browse Source

fix: change `init` to `create`

mrxiaozhuox 3 years ago
parent
commit
4cc7752adf
4 changed files with 11 additions and 12 deletions
  1. 5 5
      src/cli/create/mod.rs
  2. 2 2
      src/cli/mod.rs
  3. 1 2
      src/config.rs
  4. 3 3
      src/main.rs

+ 5 - 5
src/cli/init/mod.rs → src/cli/create/mod.rs

@@ -13,8 +13,8 @@ use crate::{error::Result, Error};
 
 /// Build the Rust WASM app and all of its assets.
 #[derive(Clone, Debug, Default, Deserialize, StructOpt)]
-#[structopt(name = "init")]
-pub struct Init {
+#[structopt(name = "create")]
+pub struct Create {
     /// Init project name
     #[structopt(default_value = ".")]
     name: String,
@@ -29,8 +29,8 @@ pub struct Init {
     pub lib: bool,
 }
 
-impl Init {
-    pub fn init(self) -> Result<()> {
+impl Create {
+    pub fn create(self) -> Result<()> {
         if Self::name_vaild_check(self.name.clone()) {
             log::error!("❗Unsupported project name.");
             return Ok(());
@@ -45,7 +45,7 @@ impl Init {
             )));
         }
 
-        log::info!("🔧 Start to init a new project '{}'.", self.name);
+        log::info!("🔧 Start to create a new project '{}'.", self.name);
 
         let output = Command::new("cargo")
             .arg("generate")

+ 2 - 2
src/cli/mod.rs

@@ -3,7 +3,7 @@ use structopt::StructOpt;
 pub mod build;
 pub mod cfg;
 pub mod clean;
-pub mod init;
+pub mod create;
 pub mod serve;
 pub mod translate;
 
@@ -35,7 +35,7 @@ pub enum Commands {
     /// Build, watch & serve the Rust WASM app and all of its assets.
     Serve(serve::Serve),
     /// Init a new project for Dioxus.
-    Init(init::Init),
+    Create(create::Create),
     // /// Clean output artifacts.
     Clean(clean::Clean),
     // /// Trunk config controls.

+ 1 - 2
src/config.rs

@@ -13,8 +13,7 @@ impl DioxusConfig {
         let crate_dir = crate::cargo::crate_root()?;
 
         if !crate_dir.join("Dioxus.toml").is_file() {
-            log::warn!("Config file: `Dioxus.toml` not found.");
-            return Ok(Self::default());
+            return Err(crate::error::Error::Unique("Config file: `Dioxus.toml` not found.".into()));
         }
 
         let mut dioxus_conf_file = File::open(crate_dir.join("Dioxus.toml"))?;

+ 3 - 3
src/main.rs

@@ -34,9 +34,9 @@ async fn main() -> Result<()> {
             }
         }
 
-        Commands::Init(opts) => {
-            if let Err(e) = opts.init() {
-                log::error!("init error: {}", e);
+        Commands::Create(opts) => {
+            if let Err(e) = opts.create() {
+                log::error!("create error: {}", e);
             }
         }
     }