kemitix/paperoni
1
0
Fork 0
Code Issues 4 Pull requests 2 Projects Releases Packages Wiki Activity

Fix bug when validating the download file name in merged mode

Browse source
This commit is contained in:
Kenneth Gitere 2021-04-30 07:47:25 +03:00
parent cae9227ab0
commit 4fd71311a1
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cli.rs
View file

@ -101,16 +101,24 @@ pub fn cli_init() -> AppConfig {
if let Some(name) = arg_matches.value_of("output_name") { if let Some(name) = arg_matches.value_of("output_name") {
let file_path = Path::new(name); let file_path = Path::new(name);
if !file_path.is_file() { if file_path.is_dir() {
eprintln!("{:?} is not a vaild file", name); eprintln!("{:?} is a directory", name);
std::process::exit(1); std::process::exit(1);
} }
let file_name = if name.ends_with(".epub") && name.len() > 5 { let file_name = if file_path.extension().is_some() {
name.to_owned() name.to_owned()
} else { } else {
name.to_owned() + ".epub" name.to_owned() + ".epub"
}; };
match std::fs::File::create(&file_name) {
Ok(_) => (),
Err(e) => {
eprintln!("Unable to create file {:?}\n{}", file_path, e);
std::process::exit(1)
}
}
app_config.merged = Some(file_name); app_config.merged = Some(file_name);
} }