From f7f9926e5efbf66164266f8b512c184f6ae2e771 Mon Sep 17 00:00:00 2001 From: scoobybejesus Date: Sat, 12 Dec 2020 14:10:06 -0500 Subject: [PATCH] Improve/fix messages/wording. --- InputFile_CSV.md | 1 - README.md | 2 +- crptls/src/csv_import_accts_txns.rs | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/InputFile_CSV.md b/InputFile_CSV.md index 2591232..e7a0f8e 100644 --- a/InputFile_CSV.md +++ b/InputFile_CSV.md @@ -200,7 +200,6 @@ but be sure not to include the ticker or symbol of the currency (i.e., for `$14,567.27 USD`, enter `14567.27` or `14,567.27`). * **memo**: This can be a string of characters of any length, though fewer than 20-30 characters is advised. -Currently, **commas** in the memo field are **not** supported. * *quantity*: This is similar to **proceeds**, in that the **decimal separator** must be a **period**, and you *cannot* include the ticker or symbol of the currency in that field. diff --git a/README.md b/README.md index be0960e..d2d77bf 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ so it can be successfully imported into `cryptools`. * Two methods each of LIFO or FIFO (compatible w/ the concept of "specific identification") -* Ability to perform like-kind exchange treatment through a particular date +* Ability to perform like-kind exchange treatment through a particular date (must use wizard or `.env` file) * Compatible with any (single) home currency diff --git a/crptls/src/csv_import_accts_txns.rs b/crptls/src/csv_import_accts_txns.rs index db225a7..ed41713 100644 --- a/crptls/src/csv_import_accts_txns.rs +++ b/crptls/src/csv_import_accts_txns.rs @@ -243,9 +243,9 @@ fn import_transactions( let tx_date = NaiveDate::parse_from_str(this_tx_date, &format_yy) .unwrap_or_else(|_| NaiveDate::parse_from_str(this_tx_date, &format_yyyy) .expect(" -Failed to parse date in input file. Confirm your choice of the separator character, which is expected to be a hyphen \ - unless otherwise set via command line flag, environment variable or .env file. Also confirm your choice of dating format \ - whether it be American (%m-%d-%y) or ISO (%y-%m-%d). Run with `--help` or see `.env.example.`\n") +FATAL: Transaction date parsing failed. You must tell the program the format of the date in your CSV Input File. The date separator \ +is expected to be a hyphen. The dating format is expected to be \"American\" (%m-%d-%y), not ISO 8601 (%y-%m-%d). You may set different \ +date format options via command line flag, environment variable or .env file. Perhaps first run with `--help` or see `.env.example.`\n") ); let transaction = Transaction {