Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions zingo-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ shellwords = { workspace = true }
tokio = { workspace = true }
tracing-subscriber = { workspace = true }
zip32 = { workspace = true }

[dev-dependencies]
tempfile = "3"
11 changes: 10 additions & 1 deletion zingo-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,16 @@
};

let data_dir = if let Some(dir) = matches.get_one::<String>("data-dir") {
PathBuf::from(dir.clone())
let path = PathBuf::from(dir.clone());
if path.is_file() {
return Err(format!(
"--data-dir must be a directory, not a file.\n\

Check warning on line 404 in zingo-cli/src/lib.rs

View workflow job for this annotation

GitHub Actions / cargo-checkmate / Cargo Checkmate (format)

Diff in /home/runner/work/zingolib/zingolib/zingo-cli/src/lib.rs
You provided: {dir}\n\
Hint: use the parent directory instead, e.g. --data-dir {}",
path.parent().map(|p| p.display().to_string()).unwrap_or_else(|| ".".into())
));
}
path
} else {
PathBuf::from("wallets")
};
Expand Down
8 changes: 8 additions & 0 deletions zingo-cli/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,14 @@ mod config_template {
let err = fill(&[examples::BIN_NAME, "--server", "https://example.com"]).unwrap_err();
assert!(err.contains("scheme"));
}

#[test]
fn data_dir_is_a_file() {
let tmp = tempfile::NamedTempFile::new().unwrap();
let file_path = tmp.path().to_str().unwrap();
let err = fill(&[examples::BIN_NAME, "--data-dir", file_path]).unwrap_err();
assert!(err.contains("must be a directory, not a file"));
}
}

mod zingo_config {
Expand Down
Loading