scoobs
/
cryptools-mirror
mirror of https://github.com/scoobybejesus/cryptools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed process::exit() in favor of recovery.

This commit is contained in:
scoobybejesus 2019-09-22 11:29:18 -04:00
parent 6440f0e47f
commit 281cc6c3ad
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/skip_wizard.rs
View File

@ -2,7 +2,6 @@
// Redistributions must include the license: https://github.com/scoobybejesus/cryptools/blob/master/LEGAL.txt // Redistributions must include the license: https://github.com/scoobybejesus/cryptools/blob/master/LEGAL.txt
use std::error::Error; use std::error::Error;
use std::process;
use std::collections::{HashMap}; use std::collections::{HashMap};
use crate::cli_user_choices; use crate::cli_user_choices;
@ -25,14 +24,16 @@ pub(crate) fn skip_wizard(args: super::Cli) -> Result<(
if let Some(file) = args.file_to_import { if let Some(file) = args.file_to_import {
input_file_path = file input_file_path = file
} else { } else {
println!("Flag to 'accept args' was set, but 'file' is missing, though it is a required field. Exiting."); println!("WARN: Flag to 'accept args' was set, but 'file' is missing. It is a required field.\n");
process::exit(66); // EX_NOINPUT (66) An input file (not a system file) did not exist or was not readable input_file_path = cli_user_choices::choose_file_for_import()?;
} }
let home_currency_choice = args.home_currency.into_string().unwrap().to_uppercase();
let output_dir_path = args.output_dir_path; let output_dir_path = args.output_dir_path;
let costing_method_choice = cli_user_choices::inv_costing_from_cmd_arg(args.inv_costing_method)?;
let home_currency_choice = args.home_currency.into_string().unwrap().to_uppercase();
let like_kind_election; let like_kind_election;
let like_kind_cutoff_date_string: String; let like_kind_cutoff_date_string: String;
@ -44,8 +45,6 @@ pub(crate) fn skip_wizard(args: super::Cli) -> Result<(
like_kind_cutoff_date_string = "1-1-1".to_string(); like_kind_cutoff_date_string = "1-1-1".to_string();
}; };
let costing_method_choice = cli_user_choices::inv_costing_from_cmd_arg(args.inv_costing_method)?;
let settings = ImportProcessParameters { let settings = ImportProcessParameters {
export_path: output_dir_path, export_path: output_dir_path,
home_currency: home_currency_choice, home_currency: home_currency_choice,