From 093224f7799058f36181c901d169cf102495a6ae Mon Sep 17 00:00:00 2001 From: scoobybejesus Date: Mon, 2 Sep 2019 23:49:18 -0400 Subject: [PATCH] Minor refactoring. Deleted dead code. Commented unused code. --- src/account.rs | 24 +++--- src/cli_user_choices.rs | 140 +++++++++++++++++------------------ src/core_functions.rs | 2 - src/create_lots_mvmts.rs | 14 ++-- src/csv_import_accts_txns.rs | 4 +- src/decimal_utils.rs | 1 + src/transaction.rs | 20 ++--- 7 files changed, 100 insertions(+), 105 deletions(-) diff --git a/src/account.rs b/src/account.rs index 4fcee7a..59c6d6d 100644 --- a/src/account.rs +++ b/src/account.rs @@ -37,10 +37,10 @@ pub struct Account { impl Account { - pub fn is_home_currency(&self, compare: &String, raw_acct_map: &HashMap) -> bool { - let raw_acct = raw_acct_map.get(&self.raw_key).unwrap(); - &raw_acct.ticker == compare - } + // pub fn is_home_currency(&self, compare: &String, raw_acct_map: &HashMap) -> bool { + // let raw_acct = raw_acct_map.get(&self.raw_key).unwrap(); + // &raw_acct.ticker == compare + // } pub fn get_sum_of_amts_in_lots(&self) -> d128 { let lots = self.list_of_lots.borrow(); @@ -82,9 +82,11 @@ impl Lot { self.movements.borrow().iter().for_each(|movement| amts += movement.amount); amts } - pub fn sum_of_amts_in_lot_is_zero(&self) -> bool { - d128!(0) == Self::get_sum_of_amts_in_lot(&self) - } + + // pub fn sum_of_amts_in_lot_is_zero(&self) -> bool { + // d128!(0) == Self::get_sum_of_amts_in_lot(&self) + // } + pub fn get_sum_of_basis_in_lot(&self) -> d128 { let mut amts = d128!(0); self.movements.borrow().iter().for_each(|movement| amts += movement.cost_basis.get()); @@ -218,10 +220,10 @@ impl Movement { } } - pub fn direction(&self) -> Polarity { - if self.amount < d128!(0.0) { Polarity::Outgoing } - else { Polarity::Incoming } - } + // pub fn direction(&self) -> Polarity { + // if self.amount < d128!(0.0) { Polarity::Outgoing } + // else { Polarity::Incoming } + // } } #[derive(Clone, Debug, PartialEq)] diff --git a/src/cli_user_choices.rs b/src/cli_user_choices.rs index b2c930c..712f2cd 100644 --- a/src/cli_user_choices.rs +++ b/src/cli_user_choices.rs @@ -171,96 +171,96 @@ pub fn inv_costing_from_cmd_arg(arg: String) -> Result) -> Result<(bool, String), Box> { - let election: bool; - let date: String; + match cutoff_date_arg { - if cutoff_date_arg.is_some() { + Some(cutoff_date_arg) => { + let provided_date = NaiveDate::parse_from_str(&cutoff_date_arg, "%y-%m-%d") + .unwrap_or(NaiveDate::parse_from_str(&cutoff_date_arg, "%Y-%m-%d") + .expect("Date entered as -c command line arg has an incorrect format.")); - let provided_date = NaiveDate::parse_from_str(&cutoff_date_arg.clone().unwrap(), "%y-%m-%d") - .unwrap_or(NaiveDate::parse_from_str(&cutoff_date_arg.clone().unwrap(), "%Y-%m-%d") - .expect("Date entered as -c command line arg has an incorrect format.")); + println!("\nUse like-kind exchange treatment through {}? [Y/n/c] ('c' to 'change') ", provided_date); - println!("\nUse like-kind exchange treatment through {}? [Y/n/c] ('c' to 'change') ", provided_date); + let (election, date) = _elect_like_kind_arg(&cutoff_date_arg, provided_date)?; - let (election, date) = _elect_like_kind_arg(&cutoff_date_arg, provided_date)?; + fn _elect_like_kind_arg(cutoff_date_arg: &String, provided_date: NaiveDate) -> Result<(bool, String), Box> { - fn _elect_like_kind_arg(cutoff_date_arg: &Option, provided_date: NaiveDate) -> Result<(bool, String), Box> { - - let mut input = String::new(); - let stdin = io::stdin(); - stdin.lock().read_line(&mut input)?; + let mut input = String::new(); + let stdin = io::stdin(); + stdin.lock().read_line(&mut input)?; - match input.trim().to_ascii_lowercase().as_str() { - "y" | "ye" | "yes" | "" => { - println!(" Using like-kind treatment through {}.\n", provided_date); - Ok( (true, cutoff_date_arg.clone().unwrap()) ) - }, - "n" | "no" => { println!(" Proceeding without like-kind treatment.\n"); - Ok( (false, "1-1-1".to_string()) ) - }, - "c" | "change" => { - println!("Please enter your desired like-kind exchange treatment cutoff date."); - println!(" You must use the format %y-%m-%d (e.g., 2017-12-31, 17-12-31, and 9-6-1 are all acceptable).\n"); + match input.trim().to_ascii_lowercase().as_str() { + "y" | "ye" | "yes" | "" => { + println!(" Using like-kind treatment through {}.\n", provided_date); + Ok( (true, cutoff_date_arg.to_string()) ) + }, + "n" | "no" => { + println!(" Proceeding without like-kind treatment.\n"); + Ok( (false, "1-1-1".to_string()) ) + }, + "c" | "change" => { + println!("Please enter your desired like-kind exchange treatment cutoff date."); + println!(" You must use the format %y-%m-%d (e.g., 2017-12-31, 17-12-31, and 9-6-1 are all acceptable).\n"); - let mut input = String::new(); - let stdin = io::stdin(); - stdin.lock().read_line(&mut input)?; - string_utils::trim_newline(&mut input); + let mut input = String::new(); + let stdin = io::stdin(); + stdin.lock().read_line(&mut input)?; + string_utils::trim_newline(&mut input); - let newly_chosen_date = NaiveDate::parse_from_str(&input, "%y-%m-%d") - .unwrap_or(NaiveDate::parse_from_str(&input, "%Y-%m-%d") - .expect("Date entered has an incorrect format. Program must abort.")); - // TODO: figure out how to make this fail gracefully and let the user input the date again - println!(" Using like-kind treatment through {}.\n", newly_chosen_date); - Ok( (true, input) ) - }, - _ => { - println!("Please respond with 'y', 'n', or 'c' (or 'yes' or 'no' or 'change')."); - _elect_like_kind_arg(&cutoff_date_arg, provided_date) + let newly_chosen_date = NaiveDate::parse_from_str(&input, "%y-%m-%d") + .unwrap_or(NaiveDate::parse_from_str(&input, "%Y-%m-%d") + .expect("Date entered has an incorrect format. Program must abort.")); + // TODO: figure out how to make this fail gracefully and let the user input the date again + println!(" Using like-kind treatment through {}.\n", newly_chosen_date); + Ok( (true, input) ) + }, + _ => { + println!("Please respond with 'y', 'n', or 'c' (or 'yes' or 'no' or 'change')."); + _elect_like_kind_arg(&cutoff_date_arg, provided_date) + } } } + + return Ok((election, date)) } - return Ok((election, date)) + None => { + println!("\nContinue without like-kind exchange treatment? [Y/n] "); - } else { + let (election, date) = _no_elect_like_kind_arg()?; - println!("\nContinue without like-kind exchange treatment? [Y/n] "); + fn _no_elect_like_kind_arg() -> Result<(bool, String), Box> { - let (election, date) = _no_elect_like_kind_arg()?; + let mut input = String::new(); + let stdin = io::stdin(); + stdin.lock().read_line(&mut input)?; - fn _no_elect_like_kind_arg() -> Result<(bool, String), Box> { + match input.trim().to_ascii_lowercase().as_str() { + "y" | "ye" | "yes" | "" => { + println!(" Proceeding without like-kind treatment.\n"); + Ok( (false, "1-1-1".to_string()) ) + }, + "n" | "no" => { + println!("Please enter your desired like-kind exchange treatment cutoff date."); + println!(" You must use the format %y-%m-%d (e.g., 2017-12-31, 17-12-31, and 9-6-1 are all acceptable).\n"); + let mut input = String::new(); + let stdin = io::stdin(); + stdin.lock().read_line(&mut input)?; + string_utils::trim_newline(&mut input); - let mut input = String::new(); - let stdin = io::stdin(); - stdin.lock().read_line(&mut input)?; + let newly_chosen_date = NaiveDate::parse_from_str(&input, "%y-%m-%d") + .unwrap_or(NaiveDate::parse_from_str(&input, "%Y-%m-%d") + .expect("Date entered has an incorrect format. Program must abort.")); + // TODO: figure out how to make this fail gracefully and let the user input the date again + println!(" Using like-kind treatment through {}.\n", newly_chosen_date); - match input.trim().to_ascii_lowercase().as_str() { - "y" | "ye" | "yes" | "" => { println!(" Proceeding without like-kind treatment.\n"); - Ok( (false, "1-1-1".to_string()) ) - }, - "n" | "no" => { - println!("Please enter your desired like-kind exchange treatment cutoff date."); - println!(" You must use the format %y-%m-%d (e.g., 2017-12-31, 17-12-31, and 9-6-1 are all acceptable).\n"); - let mut input = String::new(); - let stdin = io::stdin(); - stdin.lock().read_line(&mut input)?; - string_utils::trim_newline(&mut input); - - let newly_chosen_date = NaiveDate::parse_from_str(&input, "%y-%m-%d") - .unwrap_or(NaiveDate::parse_from_str(&input, "%Y-%m-%d") - .expect("Date entered has an incorrect format. Program must abort.")); - // TODO: figure out how to make this fail gracefully and let the user input the date again - println!(" Using like-kind treatment through {}.\n", newly_chosen_date); - - Ok( (true, input) ) - }, - _ => { println!("Please respond with 'y' or 'n' (or 'yes' or 'no')."); _no_elect_like_kind_arg() } + Ok( (true, input) ) + }, + _ => { println!("Please respond with 'y' or 'n' (or 'yes' or 'no')."); _no_elect_like_kind_arg() } + } } - } - return Ok((election, date)) + return Ok((election, date)) + } } } - diff --git a/src/core_functions.rs b/src/core_functions.rs index a5f9157..81be4ff 100644 --- a/src/core_functions.rs +++ b/src/core_functions.rs @@ -94,8 +94,6 @@ pub fn import_and_process_final( &mut rdr, transactions_map, action_records, - raw_acct_map, - acct_map )?; Ok(()) diff --git a/src/create_lots_mvmts.rs b/src/create_lots_mvmts.rs index 3f8a35f..2c63f05 100644 --- a/src/create_lots_mvmts.rs +++ b/src/create_lots_mvmts.rs @@ -259,7 +259,7 @@ pub fn create_lots_and_movements( fn get_lifo_by_creation_date(list_of_lots: &Ref>>) -> Vec { let mut vec_of_indexes = [].to_vec(); - for (idx, lot) in list_of_lots.iter().enumerate() { + for (idx, _lot) in list_of_lots.iter().enumerate() { vec_of_indexes.insert(0, idx) } let vec = vec_of_indexes; @@ -277,7 +277,7 @@ pub fn create_lots_and_movements( } } let mut vec_of_indexes = [].to_vec(); - for (idx, lot) in reordered_vec.iter().enumerate() { + for (idx, _lot) in reordered_vec.iter().enumerate() { vec_of_indexes.insert(0, idx) } let vec = vec_of_indexes; @@ -286,7 +286,7 @@ pub fn create_lots_and_movements( fn get_fifo_by_creation_date(list_of_lots: &Ref>>) -> Vec { let mut vec_of_indexes = [].to_vec(); - for (idx, lot) in list_of_lots.iter().enumerate() { + for (idx, _lot) in list_of_lots.iter().enumerate() { vec_of_indexes.push(idx) } let vec = vec_of_indexes; @@ -304,7 +304,7 @@ pub fn create_lots_and_movements( } } let mut vec_of_indexes = [].to_vec(); - for (idx, lot) in reordered_vec.iter().enumerate() { + for (idx, _lot) in reordered_vec.iter().enumerate() { vec_of_indexes.push(idx) } let vec = vec_of_indexes; @@ -329,7 +329,6 @@ pub fn create_lots_and_movements( }; fit_into_lots( - acct.raw_key, txn_num, *ar_num, whole_mvmt, @@ -649,7 +648,6 @@ fn wrap_mvmt_and_push( } fn fit_into_lots( - acct_key: u16, txn_num: u32, spawning_ar_key: u32, mvmt_to_fit: Movement, @@ -660,7 +658,7 @@ fn fit_into_lots( ar_map: &HashMap, raw_acct_map: &HashMap, acct_map: &HashMap, - ) { +) { let ar = ar_map.get(&spawning_ar_key).unwrap(); let acct = acct_map.get(&ar.account_key).unwrap(); @@ -697,7 +695,6 @@ fn fit_into_lots( proceeds: Cell::new(d128!(0.0)), }; fit_into_lots( - acct.raw_key, txn_num, spawning_ar_key, possible_mvmt_to_fit, @@ -771,7 +768,6 @@ fn fit_into_lots( }; assert!(current_index_position < vec_of_ordered_index_values.len()); fit_into_lots( - acct.raw_key, txn_num, spawning_ar_key, remainder_mvmt_to_recurse, diff --git a/src/csv_import_accts_txns.rs b/src/csv_import_accts_txns.rs index 4aa7ff2..ff3850e 100644 --- a/src/csv_import_accts_txns.rs +++ b/src/csv_import_accts_txns.rs @@ -117,8 +117,6 @@ pub fn import_transactions( rdr: &mut csv::Reader, txns_map: &mut HashMap, action_records: &mut HashMap, - raw_acct_map: &mut HashMap, - acct_map: &mut HashMap, ) -> Result<(), Box> { let mut this_tx_number = 0; @@ -138,7 +136,7 @@ pub fn import_transactions( let mut this_tx_date: &str = ""; let mut this_proceeds: &str = ""; let mut this_memo: &str = ""; - let mut this: String = "".to_string(); + let mut this: String; // Next, create action_records. let mut action_records_map_keys_vec: Vec = [].to_vec(); diff --git a/src/decimal_utils.rs b/src/decimal_utils.rs index afdf679..37c9a0d 100644 --- a/src/decimal_utils.rs +++ b/src/decimal_utils.rs @@ -8,6 +8,7 @@ pub fn round_d128_generalized(to_round: &d128, places_past_decimal: d128) -> d12 let rounded: d128 = ((to_round * d128!(10).scaleb(places_past_decimal)).quantize(d128!(1e1))) / d128!(10).scaleb(places_past_decimal); rounded//.reduce() } + pub fn round_d128_1e2(to_round: &d128) -> d128 { let rounded: d128 = ((to_round * d128!(10).scaleb(d128!(2))).quantize(d128!(1e1))) / d128!(10).scaleb(d128!(2)); rounded//.reduce() diff --git a/src/transaction.rs b/src/transaction.rs index df7a1e1..7fb7612 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -203,16 +203,16 @@ impl ActionRecord { else { Polarity::Incoming } } - pub fn is_quote_acct_for_margin_exch( - &self, - raw_accts: &HashMap, - acct_map: &HashMap - ) -> bool { + // pub fn is_quote_acct_for_margin_exch( + // &self, + // raw_accts: &HashMap, + // acct_map: &HashMap + // ) -> bool { - let acct = acct_map.get(&self.account_key).unwrap(); - let raw_acct = raw_accts.get(&acct.raw_key).unwrap(); - raw_acct.ticker.contains('_') - } + // let acct = acct_map.get(&self.account_key).unwrap(); + // let raw_acct = raw_accts.get(&acct.raw_key).unwrap(); + // raw_acct.ticker.contains('_') + // } pub fn get_mvmts_in_ar( &self, @@ -220,7 +220,7 @@ impl ActionRecord { txns_map: &HashMap, ) -> Vec> { - let polarity = Self::direction(self); + // let polarity = Self::direction(self); let txn = txns_map.get(&self.tx_key).unwrap(); let mut movements_in_ar = [].to_vec(); let acct = acct_map.get(&self.account_key).unwrap();