From f40e2f3cef474d5581d7ec560d20069da79e6376 Mon Sep 17 00:00:00 2001 From: Dangerise <2237556709@qq.com> Date: Tue, 6 Feb 2024 20:53:28 +0800 Subject: [PATCH] replace gitignore with ignore --- Cargo.lock | 12 +-- Cargo.toml | 31 ++++--- packages/autofmt/src/lib.rs | 7 ++ packages/cli/Cargo.toml | 5 +- packages/cli/src/cli/autoformat.rs | 129 ++++++++++++----------------- 5 files changed, 78 insertions(+), 106 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 965954c12..2fa0eaccd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2501,11 +2501,11 @@ dependencies = [ "flate2", "fs_extra", "futures-util", - "gitignore", "headers 0.3.9", "html_parser", "hyper 0.14.28", "hyper-rustls 0.23.2", + "ignore", "indicatif", "interprocess-docfix", "lazy_static", @@ -2514,6 +2514,7 @@ dependencies = [ "mlua", "notify", "open", + "rayon", "reqwest", "rsx-rosetta", "serde", @@ -4119,15 +4120,6 @@ dependencies = [ "url", ] -[[package]] -name = "gitignore" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d051488d9a601181a9b90c9ad8ae7e8251d642ddd2463008f2f5019d255bd89" -dependencies = [ - "glob", -] - [[package]] name = "gix-actor" version = "0.28.1" diff --git a/Cargo.toml b/Cargo.toml index a3de51715..31862400d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,23 +58,23 @@ version = "0.4.3" [workspace.dependencies] dioxus = { path = "packages/dioxus", version = "0.4.0" } dioxus-core = { path = "packages/core", version = "0.4.2" } -dioxus-core-macro = { path = "packages/core-macro", version = "0.4.0" } -dioxus-router = { path = "packages/router", version = "0.4.1" } +dioxus-core-macro = { path = "packages/core-macro", version = "0.4.0" } +dioxus-router = { path = "packages/router", version = "0.4.1" } dioxus-router-macro = { path = "packages/router-macro", version = "0.4.1" } -dioxus-html = { path = "packages/html", default-features = false, version = "0.4.0" } -dioxus-html-internal-macro = { path = "packages/html-internal-macro", version = "0.4.0" } +dioxus-html = { path = "packages/html", default-features = false, version = "0.4.0" } +dioxus-html-internal-macro = { path = "packages/html-internal-macro", version = "0.4.0" } dioxus-hooks = { path = "packages/hooks", version = "0.4.0" } -dioxus-web = { path = "packages/web", version = "0.4.0" } -dioxus-ssr = { path = "packages/ssr", version = "0.4.0" } -dioxus-desktop = { path = "packages/desktop", version = "0.4.0" } -dioxus-mobile = { path = "packages/mobile", version = "0.4.0" } +dioxus-web = { path = "packages/web", version = "0.4.0" } +dioxus-ssr = { path = "packages/ssr", version = "0.4.0" } +dioxus-desktop = { path = "packages/desktop", version = "0.4.0" } +dioxus-mobile = { path = "packages/mobile", version = "0.4.0" } dioxus-interpreter-js = { path = "packages/interpreter", version = "0.4.0" } -fermi = { path = "packages/fermi", version = "0.4.0" } -dioxus-liveview = { path = "packages/liveview", version = "0.4.0" } -dioxus-autofmt = { path = "packages/autofmt", version = "0.4.0" } -dioxus-check = { path = "packages/check", version = "0.4.0" } -dioxus-rsx = { path = "packages/rsx", version = "0.4.0" } -dioxus-tui = { path = "packages/dioxus-tui", version = "0.4.0" } +fermi = { path = "packages/fermi", version = "0.4.0" } +dioxus-liveview = { path = "packages/liveview", version = "0.4.0" } +dioxus-autofmt = { path = "packages/autofmt", version = "0.4.0" } +dioxus-check = { path = "packages/check", version = "0.4.0" } +dioxus-rsx = { path = "packages/rsx", version = "0.4.0" } +dioxus-tui = { path = "packages/dioxus-tui", version = "0.4.0" } plasmo = { path = "packages/rink", version = "0.4.0" } dioxus-native-core = { path = "packages/native-core", version = "0.4.0" } dioxus-native-core-macro = { path = "packages/native-core-macro", version = "0.4.0" } @@ -83,7 +83,7 @@ dioxus-signals = { path = "packages/signals" } dioxus-cli-config = { path = "packages/cli-config", version = "0.4.1" } generational-box = { path = "packages/generational-box", version = "0.4.3" } dioxus-hot-reload = { path = "packages/hot-reload", version = "0.4.0" } -dioxus-fullstack = { path = "packages/fullstack", version = "0.4.1" } +dioxus-fullstack = { path = "packages/fullstack", version = "0.4.1" } dioxus_server_macro = { path = "packages/server-macro", version = "0.4.1" } tracing = "0.1.37" tracing-futures = "0.2.5" @@ -144,4 +144,3 @@ thiserror = { workspace = true } manganis = { workspace = true } tracing-subscriber = "0.3.17" http-range = "0.1.5" - diff --git a/packages/autofmt/src/lib.rs b/packages/autofmt/src/lib.rs index e40b873d6..953f052b0 100644 --- a/packages/autofmt/src/lib.rs +++ b/packages/autofmt/src/lib.rs @@ -240,3 +240,10 @@ pub(crate) fn write_ifmt(input: &IfmtInput, writable: &mut impl Write) -> std::f let display = DisplayIfmt(input); write!(writable, "{}", display) } + +/// Call rustfmt to format code, i32 as exitcode +pub fn rustfmt(input: &str) -> Option { + let syntax_tree = syn::parse_file(input).ok()?; + let output = prettyplease::unparse(&syntax_tree); + Some(output) +} diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 0be33e9ae..dc53b7442 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -26,7 +26,7 @@ fs_extra = "1.2.0" cargo_toml = "0.18.0" futures-util.workspace = true notify = { version = "5.0.0-pre.16", features = ["serde"] } -html_parser = { workspace = true } +html_parser = { workspace = true } cargo_metadata = "0.18.1" tokio = { version = "1.16.1", features = ["fs", "sync", "rt", "macros"] } atty = "0.2.14" @@ -36,6 +36,7 @@ hyper = "0.14.17" hyper-rustls = "0.23.2" indicatif = "0.17.5" subprocess = "0.2.9" +rayon = "1.8.0" axum = { version = "0.5.1", features = ["ws", "headers"] } axum-server = { version = "0.5.1", features = ["tls-rustls"] } @@ -84,7 +85,7 @@ dioxus-html = { workspace = true, features = ["hot-reload-context"] } dioxus-core = { workspace = true, features = ["serialize"] } dioxus-hot-reload = { workspace = true } interprocess-docfix = { version = "1.2.2" } -gitignore = "1.0.8" +ignore = "0.4.22" [features] default = [] diff --git a/packages/cli/src/cli/autoformat.rs b/packages/cli/src/cli/autoformat.rs index d2e894d82..01612a109 100644 --- a/packages/cli/src/cli/autoformat.rs +++ b/packages/cli/src/cli/autoformat.rs @@ -1,6 +1,6 @@ use dioxus_autofmt::{IndentOptions, IndentType}; -use futures_util::{stream::FuturesUnordered, StreamExt}; -use std::{fs, path::Path, process::exit}; +use rayon::prelude::*; +use std::{fs, io, path::Path, process::exit}; use super::*; @@ -40,13 +40,14 @@ impl Autoformat { raw, file, split_line_attributes, - rustfmt, + rustfmt: do_rustfmt, .. } = self; // Default to formatting the project if raw.is_none() && file.is_none() { - if let Err(e) = autoformat_project(check, split_line_attributes).await { + println!("format project !"); + if let Err(e) = autoformat_project(check, split_line_attributes, do_rustfmt).await { eprintln!("error formatting project: {}", e); exit(1); } @@ -65,46 +66,13 @@ impl Autoformat { // Format single file if let Some(file) = file { - refactor_file(file, split_line_attributes, rustfmt)?; + refactor_file(file, split_line_attributes, do_rustfmt)?; } Ok(()) } } -/// Call rustfmt to format code, i32 as exitcode -fn rustfmt(input: String) -> Result { - use std::thread; - - let mut child = Command::new("rustfmt") - .stdin(Stdio::piped()) - .stdout(Stdio::piped()) - .spawn() - .map_err(|e| Error::IO(e))?; - - let mut stdin = child.stdin.take().unwrap(); - let pass_in = input.to_string(); - let handle = thread::spawn(move || -> Result<()> { - stdin - .write_all(pass_in.as_bytes()) - .map_err(|e| Error::IO(e))?; - Ok(()) - }); - handle.join().unwrap()?; - - let output = child.wait_with_output().map_err(|e| Error::IO(e))?; - - if let Some(exit_code) = output.status.code() { - if exit_code != 0 { - return Err(Error::ExitCodeNotZero(exit_code)); - } - } - - let output = String::from_utf8(output.stdout).map_err(|e| Error::Other(e.into()))?; - - Ok(output) -} - fn refactor_file(file: String, split_line_attributes: bool, do_rustfmt: bool) -> Result<(), Error> { let indent = indentation_for(".", split_line_attributes)?; let file_content = if file == "-" { @@ -120,7 +88,7 @@ fn refactor_file(file: String, split_line_attributes: bool, do_rustfmt: bool) -> }; if do_rustfmt { - s = rustfmt(s)?; + s = dioxus_autofmt::rustfmt(&s).ok_or_else(|| Error::ParseError("Syntax Error".into()))?; } let edits = dioxus_autofmt::fmt_file(&s, indent); @@ -137,25 +105,21 @@ fn refactor_file(file: String, split_line_attributes: bool, do_rustfmt: bool) -> Ok(()) } -fn get_project_files(config: &CrateConfig) -> Vec { - let mut files = vec![]; - - let gitignore_path = config.crate_dir.join(".gitignore"); - if gitignore_path.is_file() { - let gitigno = gitignore::File::new(gitignore_path.as_path()).unwrap(); - if let Ok(git_files) = gitigno.included_files() { - let git_files = git_files - .into_iter() - .filter(|f| f.ends_with(".rs") && !is_target_dir(f)); - files.extend(git_files) - }; - } else { - collect_rs_files(&config.crate_dir, &mut files); +use std::ffi::OsStr; +fn get_project_files() -> Vec { + let mut files = Vec::new(); + for result in ignore::Walk::new("./") { + let path = result.unwrap().into_path(); + if let Some(ext) = path.extension() { + if ext == OsStr::new("rs") { + files.push(path); + } + } } - files } +#[allow(dead_code)] fn is_target_dir(file: &Path) -> bool { let stripped = if let Ok(cwd) = std::env::current_dir() { file.strip_prefix(cwd).unwrap_or(file) @@ -169,18 +133,30 @@ fn is_target_dir(file: &Path) -> bool { } } -async fn format_file( - path: impl AsRef, - indent: IndentOptions, -) -> Result { - let contents = tokio::fs::read_to_string(&path).await?; +fn format_file(path: impl AsRef, indent: IndentOptions, do_rustfmt: bool) -> Result { + let mut contents = fs::read_to_string(&path)?; + let mut if_write = false; + if do_rustfmt { + let formatted = dioxus_autofmt::rustfmt(&contents) + .ok_or_else(|| Error::ParseError("Syntax Error".into()))?; + if contents != formatted { + if_write = true; + contents = formatted; + } + } + + println!("at {} : {:#?}", path.as_ref().display(), &contents); let edits = dioxus_autofmt::fmt_file(&contents, indent); let len = edits.len(); if !edits.is_empty() { + if_write = true; + } + + if if_write { let out = dioxus_autofmt::apply_formats(&contents, edits); - tokio::fs::write(path, out).await?; + fs::write(path, out)?; } Ok(len) @@ -190,11 +166,15 @@ async fn format_file( /// /// Runs using Tokio for multithreading, so it should be really really fast /// -/// Doesn't do mod-descending, so it will still try to format unreachable files. TODO. -async fn autoformat_project(check: bool, split_line_attributes: bool) -> Result<()> { - let crate_config = dioxus_cli_config::CrateConfig::new(None)?; +/// Doesnhttps://www.rustwiki.org.cn/zh-CN/std/'t do mod-descending, so it will still try to format unreachable files. TODO. +async fn autoformat_project( + check: bool, + split_line_attributes: bool, + do_rustfmt: bool, +) -> Result<()> { + let files_to_format = get_project_files(); - let files_to_format = get_project_files(&crate_config); + dbg!(&files_to_format); if files_to_format.is_empty() { return Ok(()); @@ -203,26 +183,18 @@ async fn autoformat_project(check: bool, split_line_attributes: bool) -> Result< let indent = indentation_for(&files_to_format[0], split_line_attributes)?; let counts = files_to_format - .into_iter() - .map(|path| async { - let path_clone = path.clone(); - let res = tokio::spawn(format_file(path, indent.clone())).await; - + .into_par_iter() + .map(|path| { + let res = format_file(&path, indent.clone(), do_rustfmt); match res { + Ok(cnt) => Some(cnt), Err(err) => { - eprintln!("error formatting file: {}\n{err}", path_clone.display()); + eprintln!("error formatting file : {}\n{:#?}", path.display(), err); None } - Ok(Err(err)) => { - eprintln!("error formatting file: {}\n{err}", path_clone.display()); - None - } - Ok(Ok(res)) => Some(res), } }) - .collect::>() - .collect::>() - .await; + .collect::>(); let files_formatted: usize = counts.into_iter().flatten().sum(); @@ -281,6 +253,7 @@ fn indentation_for( )) } +#[allow(dead_code)] fn collect_rs_files(folder: &impl AsRef, files: &mut Vec) { if is_target_dir(folder.as_ref()) { return;