zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Give fmt a --overwrite flag.

Browse Source 
Fixes: #51
This commit is contained in:
Jeremy Wall 2019-10-02 20:55:12 -05:00
parent b9309ce12b
commit acfd343c7a
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.rs
View File

@ -66,6 +66,7 @@ fn do_flags<'a, 'b>() -> clap::App<'a, 'b> {
(@arg recurse: -r "Whether we should recurse or not.") (@arg recurse: -r "Whether we should recurse or not.")
(@arg indent: -i --indent "How many spaces to indent by. Defaults to 4") (@arg indent: -i --indent "How many spaces to indent by. Defaults to 4")
(@arg INPUT: ... "Input ucg files or directories to format") (@arg INPUT: ... "Input ucg files or directories to format")
(@arg write: -w --overwrite "Whether to overwrite the with the formatted form")
) )
(@subcommand converters => (@subcommand converters =>
(about: "list the available converters") (about: "list the available converters")
@ -386,15 +387,23 @@ fn build_command<C: Cache>(
} }
} }
fn fmt_file(p: &Path, indent: usize) -> std::result::Result<(), Box<dyn Error>> { fn fmt_file(p: &Path, indent: usize, overwrite: bool) -> std::result::Result<(), Box<dyn Error>> {
let mut f = File::open(p)?;
let mut contents = String::new(); let mut contents = String::new();
f.read_to_string(&mut contents)?; {
let mut f = File::open(p)?;
f.read_to_string(&mut contents)?;
}
let mut comment_map = BTreeMap::new(); let mut comment_map = BTreeMap::new();
let stmts = parse(OffsetStrIter::new(&contents), Some(&mut comment_map))?; let stmts = parse(OffsetStrIter::new(&contents), Some(&mut comment_map))?;
let mut printer = ucglib::ast::printer::AstPrinter::new(indent, std::io::stdout()) if overwrite {
.with_comment_map(&comment_map); let mut printer = ucglib::ast::printer::AstPrinter::new(indent, File::create(p)?)
printer.render(&stmts)?; .with_comment_map(&comment_map);
printer.render(&stmts)?;
} else {
let mut printer = ucglib::ast::printer::AstPrinter::new(indent, std::io::stdout())
.with_comment_map(&comment_map);
printer.render(&stmts)?;
}
Ok(()) Ok(())
} }
@ -408,7 +417,7 @@ fn fmt_dir(p: &Path, recurse: bool, indent: usize) -> std::result::Result<(), Bo
if path.is_dir() && recurse { if path.is_dir() && recurse {
fmt_dir(&path, recurse, indent)?; fmt_dir(&path, recurse, indent)?;
} else { } else {
fmt_file(&path, indent)?; fmt_file(&path, indent, true)?;
} }
} }
Ok(()) Ok(())
@ -417,6 +426,7 @@ fn fmt_dir(p: &Path, recurse: bool, indent: usize) -> std::result::Result<(), Bo
fn fmt_command(matches: &clap::ArgMatches) -> std::result::Result<(), Box<dyn Error>> { fn fmt_command(matches: &clap::ArgMatches) -> std::result::Result<(), Box<dyn Error>> {
let files = matches.values_of("INPUT"); let files = matches.values_of("INPUT");
let recurse = matches.is_present("recurse"); let recurse = matches.is_present("recurse");
let overwrite = matches.is_present("write");
let indent = match matches.value_of("indent") { let indent = match matches.value_of("indent") {
Some(s) => s.parse::<usize>()?, Some(s) => s.parse::<usize>()?,
None => 4, None => 4,
@ -434,7 +444,7 @@ fn fmt_command(matches: &clap::ArgMatches) -> std::result::Result<(), Box<dyn Er
if p.is_dir() { if p.is_dir() {
fmt_dir(&p, recurse, indent)?; fmt_dir(&p, recurse, indent)?;
} else { } else {
fmt_file(&p, indent)?; fmt_file(&p, indent, overwrite)?;
} }
} }
Ok(()) Ok(())