Skip to content

Made explicit --input and --output optional #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

Made explicit --input and --output optional #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions cmdapp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,30 @@ pub fn config_from_args() -> (PathBuf, PathBuf, Config) {
.long("input")
.short("i")
.takes_value(true)
.required_unless("posinput")
.help("Path to input raster image")
.required(true),
);

let app = app.arg(
Arg::with_name("output")
.long("output")
.short("o")
.takes_value(true)
.required_unless("posoutput")
.help("Path to output vector graphics")
.required(true),
);

let app = app.arg(
Arg::with_name("posinput")
.index(1)
.required_unless("input")
);
let app = app.arg(
Arg::with_name("posoutput")
.index(2)
.required_unless("output")
);

let app = app.arg(
Arg::with_name("color_mode")
.long("colormode")
Expand Down Expand Up @@ -130,9 +141,11 @@ pub fn config_from_args() -> (PathBuf, PathBuf, Config) {
let mut config = Config::default();
let input_path = matches
.value_of("input")
.or_else(|| matches.value_of("posinput"))
.expect("Input path is required, please specify it by --input or -i.");
let output_path = matches
.value_of("output")
.or_else(|| matches.value_of("posoutput"))
.expect("Output path is required, please specify it by --output or -o.");

let input_path = PathBuf::from(input_path);
Expand Down