Merge pull request #139 from Sol-Ell/make-clone-repo-err-clear

Make git clone repo err clear

src/builder.rs

@@ -49,7 +49,8 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
     // [1] Build the .wasm module
     log::info!("🚅 Running build command...");
     let cmd = subprocess::Exec::cmd("cargo");
-    let cmd = cmd.cwd(&crate_dir)
+    let cmd = cmd
+        .cwd(&crate_dir)
         .arg("build")
         .arg("--target")
         .arg("wasm32-unknown-unknown")
@@ -66,25 +67,18 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
         cmd
     };
 
-    let cmd = if quiet {
+    let cmd = if quiet { cmd.arg("--quiet") } else { cmd };
-        cmd.arg("--quiet")
-    } else {
-        cmd
-    };
 
     let cmd = if config.custom_profile.is_some() {
         let custom_profile = config.custom_profile.as_ref().unwrap();
-        cmd
+        cmd.arg("--profile").arg(custom_profile)
-            .arg("--profile")
-            .arg(custom_profile)
     } else {
         cmd
     };
 
     let cmd = if config.features.is_some() {
         let features_str = config.features.as_ref().unwrap().join(" ");
-        cmd.arg("--features")
+        cmd.arg("--features").arg(features_str)
-            .arg(features_str)
     } else {
         cmd
     };
@@ -394,9 +388,9 @@ fn prettier_build(cmd: subprocess::Exec) -> anyhow::Result<Vec<Diagnostic>> {
                 let message = msg.message;
                 match message.level {
                     cargo_metadata::diagnostic::DiagnosticLevel::Error => {
-                        return Err(anyhow::anyhow!(
+                        return Err(anyhow::anyhow!(message
-                            message.rendered.unwrap_or("Unknown".into())
+                            .rendered
-                        ));
+                            .unwrap_or("Unknown".into())));
                     }
                     cargo_metadata::diagnostic::DiagnosticLevel::Warning => {
                         warning_messages.push(message.clone());

src/cargo.rs

@@ -34,7 +34,9 @@ pub fn crate_root() -> Result<PathBuf> {
             }
             None
         })
-        .ok_or_else(|| Error::CargoError("Failed to find directory containing Cargo.toml".to_string()))
+        .ok_or_else(|| {
+            Error::CargoError("Failed to find directory containing Cargo.toml".to_string())
+        })
 }
 
 /// Checks if the directory contains `Cargo.toml`

src/cli/cfg.rs

@@ -78,7 +78,7 @@ pub struct ConfigOptsServe {
     pub hot_reload: bool,
 
     /// Set cross-origin-policy to same-origin [default: false]
-    #[clap(name="cross-origin-policy")]
+    #[clap(name = "cross-origin-policy")]
     #[clap(long)]
     #[serde(default)]
     pub cross_origin_policy: bool,

src/cli/plugin/mod.rs

@@ -21,7 +21,8 @@ impl Plugin {
                 }
             }
             Plugin::AppPath {} => {
-                if let Some(v) = crate::plugin::PluginManager::init_plugin_dir().to_str() {
+                let plugin_dir = crate::plugin::PluginManager::init_plugin_dir();
+                if let Some(v) = plugin_dir.to_str() {
                     println!("{}", v);
                 } else {
                     log::error!("Plugin path get failed.");

src/cli/serve/mod.rs

@@ -31,7 +31,7 @@ impl Serve {
         if self.serve.profile.is_some() {
             crate_config.set_profile(self.serve.profile.unwrap());
         }
-        
+
         if self.serve.features.is_some() {
             crate_config.set_features(self.serve.features.unwrap());
         }

src/cli/translate/mod.rs

@@ -1,8 +1,6 @@
 use std::process::exit;
 
-use dioxus_rsx::{BodyNode, CallBody, Component};
+use dioxus_rsx::{BodyNode, CallBody};
-use proc_macro2::{Ident, Span};
-use syn::punctuated::Punctuated;
 
 use super::*;
 

src/config.rs

@@ -236,7 +236,7 @@ impl CrateConfig {
         self
     }
 
-    pub fn  with_cross_origin_policy(&mut self, cross_origin_policy: bool) -> &mut Self {
+    pub fn with_cross_origin_policy(&mut self, cross_origin_policy: bool) -> &mut Self {
         self.cross_origin_policy = cross_origin_policy;
         self
     }

src/plugin/mod.rs

@@ -294,7 +294,9 @@ impl PluginManager {
         if !plugin_path.is_dir() {
             log::info!("📖 Start to init plugin library ...");
             let url = "https://github.com/DioxusLabs/cli-plugin-library";
-            clone_repo(&plugin_path, url).unwrap();
+            if let Err(err) = clone_repo(&plugin_path, url) {
+                log::error!("Failed to init plugin dir, error caused by {}. ", err);
+            }
         }
         plugin_path
     }

src/server/mod.rs

@@ -136,7 +136,12 @@ pub async fn hot_reload_handler(
 }
 
 #[allow(unused_assignments)]
-pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig, start_browser: bool) -> Result<()> {
+pub async fn startup_hot_reload(
+    ip: String,
+    port: u16,
+    config: CrateConfig,
+    start_browser: bool,
+) -> Result<()> {
     let first_build_result = crate::builder::build(&config, false)?;
 
     log::info!("🚀 Starting development server...");
@@ -272,11 +277,11 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig, star
     );
 
     let cors = CorsLayer::new()
-    // allow `GET` and `POST` when accessing the resource
+        // allow `GET` and `POST` when accessing the resource
-    .allow_methods([Method::GET, Method::POST])
+        .allow_methods([Method::GET, Method::POST])
-    // allow requests from any origin
+        // allow requests from any origin
-    .allow_origin(Any)
+        .allow_origin(Any)
-    .allow_headers(Any);
+        .allow_headers(Any);
 
     let (coep, coop) = if config.cross_origin_policy {
         (
@@ -296,10 +301,7 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig, star
             HeaderName::from_static("cross-origin-embedder-policy"),
             coep,
         )
-        .override_response_header(
+        .override_response_header(HeaderName::from_static("cross-origin-opener-policy"), coop)
-            HeaderName::from_static("cross-origin-opener-policy"),
-            coop,
-        )
         .and_then(
             move |response: Response<ServeFileSystemResponseBody>| async move {
                 let response = if file_service_config
@@ -456,11 +458,11 @@ pub async fn startup_default(
     PluginManager::on_serve_start(&config)?;
 
     let cors = CorsLayer::new()
-    // allow `GET` and `POST` when accessing the resource
+        // allow `GET` and `POST` when accessing the resource
-    .allow_methods([Method::GET, Method::POST])
+        .allow_methods([Method::GET, Method::POST])
-    // allow requests from any origin
+        // allow requests from any origin
-    .allow_origin(Any)
+        .allow_origin(Any)
-    .allow_headers(Any);
+        .allow_headers(Any);
 
     let (coep, coop) = if config.cross_origin_policy {
         (
@@ -480,10 +482,7 @@ pub async fn startup_default(
             HeaderName::from_static("cross-origin-embedder-policy"),
             coep,
         )
-        .override_response_header(
+        .override_response_header(HeaderName::from_static("cross-origin-opener-policy"), coop)
-            HeaderName::from_static("cross-origin-opener-policy"),
-            coop,
-        )
         .and_then(
             move |response: Response<ServeFileSystemResponseBody>| async move {
                 let response = if file_service_config

src/tools.rs

@@ -1,6 +1,6 @@
 use std::{
     fs::{create_dir_all, File},
-    io::{Read, Write},
+    io::{ErrorKind, Read, Write},
     path::{Path, PathBuf},
     process::Command,
 };
@@ -46,7 +46,13 @@ pub fn clone_repo(dir: &Path, url: &str) -> anyhow::Result<()> {
 
     let mut cmd = Command::new("git");
     let cmd = cmd.current_dir(target_dir);
-    let _res = cmd.arg("clone").arg(url).arg(dir_name).output()?;
+    let res = cmd.arg("clone").arg(url).arg(dir_name).output();
+    if let Err(err) = res {
+        if ErrorKind::NotFound == err.kind() {
+            log::warn!("Git program not found. Hint: Install git or check $PATH.");
+            return Err(err.into());
+        }
+    }
     Ok(())
 }