From c328cae78f099c990b5cd5897d7d1fd4d0cb5771 Mon Sep 17 00:00:00 2001 From: Peter Anning <22272449+peteanning@users.noreply.github.com> Date: Sun, 6 Nov 2022 14:12:56 +0000 Subject: [PATCH 1/2] fixed download aoc syntax --- src/bin/download.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bin/download.rs b/src/bin/download.rs index 881f6af..22a32fc 100644 --- a/src/bin/download.rs +++ b/src/bin/download.rs @@ -56,21 +56,27 @@ fn main() { exit_with_status(1, &tmp_file_path); } - println!("Downloading input via aoc-cli..."); - let mut cmd_args = vec![ - "download".into(), + let mut tmp_cmd_args = vec![ "--file".into(), tmp_file_path.to_string_lossy().to_string(), "--day".into(), args.day.to_string(), + "download".into(), ]; + + let mut cmd_args = vec![]; + if let Some(year) = args.year { cmd_args.push("--year".into()); cmd_args.push(year.to_string()); } + cmd_args.append(&mut tmp_cmd_args); + + println!("Downloading input with >aoc {}", cmd_args.join(" ")); + match Command::new("aoc").args(cmd_args).output() { Ok(cmd_output) => { io::stdout() From 1b9904a877bccc6b4a528700afb1e96a2d0a760b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sp=C3=B6ttel?= <1682504+fspoettel@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:21:06 +0100 Subject: [PATCH 2/2] chore: remove tmp assignment --- src/bin/download.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/bin/download.rs b/src/bin/download.rs index 22a32fc..85caa84 100644 --- a/src/bin/download.rs +++ b/src/bin/download.rs @@ -56,16 +56,6 @@ fn main() { exit_with_status(1, &tmp_file_path); } - - let mut tmp_cmd_args = vec![ - "--file".into(), - tmp_file_path.to_string_lossy().to_string(), - "--day".into(), - args.day.to_string(), - "download".into(), - ]; - - let mut cmd_args = vec![]; if let Some(year) = args.year { @@ -73,7 +63,13 @@ fn main() { cmd_args.push(year.to_string()); } - cmd_args.append(&mut tmp_cmd_args); + cmd_args.append(&mut vec![ + "--file".into(), + tmp_file_path.to_string_lossy().to_string(), + "--day".into(), + args.day.to_string(), + "download".into(), + ]); println!("Downloading input with >aoc {}", cmd_args.join(" "));