Commit 3657f8c

authored

feat(scaffold): overwrite argument (#63)

1 parent e2062e3 commit 3657f8cCopy full SHA for 3657f8c

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ mod args {`
`20`	`20`	`Scaffold {`
`21`	`21`	`day: Day,`
`22`	`22`	`download: bool,`
	`23`	`+ overwrite: bool,`
`23`	`24`	`},`
`24`	`25`	`Solve {`
`25`	`26`	`day: Day,`
`@@ -65,6 +66,7 @@ mod args {`
`65`	`66`	`Some("scaffold") => AppArguments::Scaffold {`
`66`	`67`	`day: args.free_from_str()?,`
`67`	`68`	`download: args.contains("--download"),`
	`69`	`+ overwrite: args.contains("--overwrite"),`
`68`	`70`	`},`
`69`	`71`	`Some("solve") => AppArguments::Solve {`
`70`	`72`	`day: args.free_from_str()?,`
`@@ -104,8 +106,8 @@ fn main() {`
`104`	`106`	`AppArguments::Time { day, all, store } => time::handle(day, all, store),`
`105`	`107`	`AppArguments::Download { day } => download::handle(day),`
`106`	`108`	`AppArguments::Read { day } => read::handle(day),`
`107`		`- AppArguments::Scaffold { day, download } => {`
`108`		`- scaffold::handle(day);`
	`109`	`+ AppArguments::Scaffold { day, download, overwrite } => {`
	`110`	`+ scaffold::handle(day, overwrite);`
`109`	`111`	`if download {`
`110`	`112`	`download::handle(day);`
`111`	`113`	`}`
`@@ -120,7 +122,7 @@ fn main() {`
`120`	`122`	`AppArguments::Today => {`
`121`	`123`	`match Day::today() {`
`122`	`124`	`Some(day) => {`
`123`		`- scaffold::handle(day);`
	`125`	`+ scaffold::handle(day,false);`
`124`	`126`	`download::handle(day);`
`125`	`127`	`read::handle(day)`
`126`	`128`	`}`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,14 @@ use crate::template::Day;`
`9`	`9`	`const MODULE_TEMPLATE: &str =`
`10`	`10`	`include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/template.txt"));`
`11`	`11`
`12`		`-fn safe_create_file(path: &str) -> Result<File, std::io::Error> {`
`13`		`- OpenOptions::new().write(true).create_new(true).open(path)`
	`12`	`+fn safe_create_file(path: &str, overwrite: bool) -> Result<File, std::io::Error> {`
	`13`	`+ let mut file = OpenOptions::new();`
	`14`	`+ if overwrite {`
	`15`	`+ file.create(true);`
	`16`	`+ } else {`
	`17`	`+ file.create_new(true);`
	`18`	`+ }`
	`19`	`+ file.truncate(true).write(true).open(path)`
`14`	`20`	`}`
`15`	`21`
`16`	`22`	`fn create_file(path: &str) -> Result<File, std::io::Error> {`
`@@ -21,12 +27,12 @@ fn create_file(path: &str) -> Result<File, std::io::Error> {`
`21`	`27`	`.open(path)`
`22`	`28`	`}`
`23`	`29`
`24`		`-pub fn handle(day: Day) {`
	`30`	`+pub fn handle(day: Day,overwrite:bool) {`
`25`	`31`	`let input_path = format!("data/inputs/{day}.txt");`
`26`	`32`	`let example_path = format!("data/examples/{day}.txt");`
`27`	`33`	`let module_path = format!("src/bin/{day}.rs");`
`28`	`34`
`29`		`- let mut file = match safe_create_file(&module_path) {`
	`35`	`+ let mut file = match safe_create_file(&module_path, overwrite) {`
`30`	`36`	`Ok(file) => file,`
`31`	`37`	`Err(e) => {`
`32`	`38`	`eprintln!("Failed to create module file: {e}");`

Comments

(0)