Improve/fix messages/wording.

This commit is contained in:
scoobybejesus 2020-12-12 14:33:36 -05:00
parent f7f9926e5e
commit f6e9b5525b
5 changed files with 23 additions and 21 deletions

View File

@ -60,7 +60,7 @@ pub fn import_and_process_final(
&mut transactions_map, &mut transactions_map,
)?; )?;
println!(" Successfully imported csv file."); println!(" Successfully imported CSV Input File.");
println!("Processing the data..."); println!("Processing the data...");
transactions_map = create_lots_mvmts::create_lots_and_movements( transactions_map = create_lots_mvmts::create_lots_and_movements(

View File

@ -28,7 +28,7 @@ pub fn import_from_csv(
let file = match File::open(import_file_path) { let file = match File::open(import_file_path) {
Ok(x) => { Ok(x) => {
println!("\nCSV ledger file opened successfully.\n"); // println!("\nCSV ledger file opened successfully.\n");
x x
}, },
Err(e) => { Err(e) => {
@ -90,7 +90,7 @@ ordered chronologically (i.e., beginning in column 4 - the 1st account column -
The next column's value should be 2, then 3, etc, until the final account)."; The next column's value should be 2, then 3, etc, until the final account).";
// Header row variables have been set. It's now time to set up the accounts. // Header row variables have been set. It's now time to set up the accounts.
println!("Attempting to create accounts..."); println!("\nCreating accounts...");
let length = &headerstrings.len(); let length = &headerstrings.len();
@ -153,7 +153,7 @@ fn import_transactions(
let mut changed_action_records = 0; let mut changed_action_records = 0;
let mut changed_txn_num = Vec::new(); let mut changed_txn_num = Vec::new();
println!("Attempting to create transactions..."); println!("Creating transactions...");
for result in rdr.records() { for result in rdr.records() {

View File

@ -1,6 +1,6 @@
## CONFIGURATION ## CONFIGURATION
## ##
## If the defaults below are not suitable, copy this .env.example into a new .env file, ## The defaults are shown below. If the defaults are not suitable, copy this .env.example into a new .env file,
## uncomment the respective enviroment variable, and set the value according to your needs. ## uncomment the respective enviroment variable, and set the value according to your needs.
## Alternatively, command line flags are available for ISO_DATE and DATE_SEPARATOR_SWITCH. ## Alternatively, command line flags are available for ISO_DATE and DATE_SEPARATOR_SWITCH.
## Command line flags will override enviroment variables. ## Command line flags will override enviroment variables.
@ -26,6 +26,7 @@
# (Optional; default is not set) # (Optional; default is not set)
#LK_CUTOFF_DATE=YYYY-mm-DD #LK_CUTOFF_DATE=YYYY-mm-DD
# These are the options available for choosing in which order lots are chosen for disposals.
#1. LIFO according to the order the lot was created. #1. LIFO according to the order the lot was created.
#2. LIFO according to the basis date of the lot. #2. LIFO according to the basis date of the lot.
#3. FIFO according to the order the lot was created. #3. FIFO according to the order the lot was created.

View File

@ -119,8 +119,7 @@ This software will import your csv file's ledger of cryptocurrency transactions.
It will then process it by creating 'lots' and posting 'movements' to those lots. It will then process it by creating 'lots' and posting 'movements' to those lots.
Along the way, it will keep track of income, expenses, gains, and losses. Along the way, it will keep track of income, expenses, gains, and losses.
See .env.example for environment variables that may be set in a .env file in order to See examples/.env.example or run with --help to learn how to change default program behavior.
change default program behavior.
Note: The software is designed to import a full history. Gains and losses may be incorrect otherwise. Note: The software is designed to import a full history. Gains and losses may be incorrect otherwise.
"); ");

View File

@ -20,10 +20,12 @@ use crate::wizard;
pub fn get_env(cmd_args: &super::Cli) -> Result<super::Cfg, Box<dyn Error>> { pub fn get_env(cmd_args: &super::Cli) -> Result<super::Cfg, Box<dyn Error>> {
match dotenv::dotenv() { match dotenv::dotenv() {
Ok(_path) => { println!("Setting environment variables from .env file.") }, Ok(_path) => { println!("Exporting temporary environment variables from .env file.") },
Err(_e) => println!("Did not find .env file.") Err(_e) => println!("Did not find .env file.")
} }
println!(" Setting runtime variables according to command line options or environment variables (the former take precedent).");
let iso_date: bool = if cmd_args.iso_date { let iso_date: bool = if cmd_args.iso_date {
println!(" Command line flag for ISO_DATE was set. Using YY-mm-dd or YY/mm/dd."); println!(" Command line flag for ISO_DATE was set. Using YY-mm-dd or YY/mm/dd.");
true true