Merge pull request #68 from frosklis/frosklis/issue22

Infer currency format from the journal file

Author: frosklis

CHANGELOG.md

@@ -2,6 +2,8 @@
 Changelog file for dinero-rs project, a command line application for managing finances.
 
 ## [0.21.0] - xxx
+### Added
+- Infer currency format from the journal file
 ### Changed
 - Continuos integration pipeline is now better. No more problems like what happened between releases 0.18 and 0.20.
 ### Fixed

src/list.rs

@@ -51,6 +51,27 @@ impl<'a, T: Eq + Hash + HasName + Clone + FromDirective + HasAliases + Debug> Li
             }
         }
     }
+    /// Removes an ```element``` in the list
+    pub fn remove(&mut self, element: &T) {
+        let found = self.list.get(&element.get_name().to_lowercase());
+        match found {
+            Some(x) => {
+                for alias in x.get_aliases() {
+                    self.aliases.remove(&alias.to_lowercase());
+                }
+                self.list.remove(&element.get_name().to_lowercase());
+            }
+            None => {
+                for alias in element.get_aliases() {
+                    let value = self.aliases.remove(&alias.to_lowercase());
+                    if let Some(x) = value {
+                        self.list.remove(&x);
+                    }
+                    self.list.remove(&alias.to_lowercase());
+                }
+            }
+        }
+    }
     /// Add an alias
     pub fn add_alias(&mut self, alias: String, for_element: &'a T) {
         let element = self.aliases.get(&alias.to_lowercase());

src/models/currency.rs

@@ -199,7 +199,8 @@ impl Currency {
                     rule = parsed.next().unwrap();
                 }
                 integer_format = Some(rule);
-                self.negative_amount_display = NegativeAmountDisplay::AfterNumber;
+                // todo think
+                self.negative_amount_display = NegativeAmountDisplay::BeforeNumberBehindCurrency;
             }
             other => {
                 panic!("Other: {:?}", other);

src/models/mod.rs

@@ -67,16 +67,6 @@ impl ParsedLedger {
                 if let Some(payee) = p.payee.clone() {
                     payee_strs.insert(payee);
                 }
-                // Currencies
-                if let Some(c) = &p.money_currency {
-                    commodity_strs.insert(c.clone());
-                }
-                if let Some(c) = &p.cost_currency {
-                    commodity_strs.insert(c.clone());
-                }
-                if let Some(c) = &p.balance_currency {
-                    commodity_strs.insert(c.clone());
-                }
             }
         }
         for price in self.prices.iter() {

src/parser/mod.rs

@@ -132,7 +132,9 @@ impl<'a> Tokenizer<'a> {
                                     ledger.tags.push(self.parse_tag(inner));
                                 }
                                 Rule::commodity => {
-                                    ledger.commodities.insert(self.parse_commodity(inner));
+                                    let commodity = self.parse_commodity(inner);
+                                    ledger.commodities.remove(&commodity);
+                                    ledger.commodities.insert(commodity);
                                 }
                                 Rule::account_dir => {
                                     ledger.accounts.insert(self.parse_account(inner));
@@ -144,7 +146,26 @@ impl<'a> Tokenizer<'a> {
                             }
                         }
                         Rule::transaction | Rule::automated_transaction => {
-                            ledger.transactions.push(self.parse_transaction(element));
+                            let transaction = self.parse_transaction(element);
+                            for posting in transaction.postings.borrow().iter() {
+                                let currencies = &[
+                                    (&posting.money_currency, &posting.money_format),
+                                    (&posting.cost_currency, &posting.cost_format),
+                                    (&posting.balance_currency, &posting.balance_format),
+                                ];
+                                for (currency, format) in currencies {
+                                    if let Some(c) = currency {
+                                        let found = ledger.commodities.get(c);
+                                        if found.is_err() {
+                                            let mut commodity = Currency::from(c.as_str());
+                                            commodity
+                                                .set_format(format.as_ref().unwrap().to_owned());
+                                            ledger.commodities.insert(commodity);
+                                        }
+                                    }
+                                }
+                            }
+                            ledger.transactions.push(transaction);
                         }
                         _x => {
                             // eprintln!("{:?}", x);

src/parser/tokenizers/transaction.rs

@@ -85,11 +85,14 @@ pub struct RawPosting {
     pub date: Option<NaiveDate>,
     pub money_amount: Option<BigRational>,
     pub money_currency: Option<String>,
+    pub money_format: Option<String>,
     pub cost_amount: Option<BigRational>,
     pub cost_currency: Option<String>,
+    pub cost_format: Option<String>,
     pub cost_type: Option<PriceType>,
     pub balance_amount: Option<BigRational>,
     pub balance_currency: Option<String>,
+    pub balance_format: Option<String>,
     pub comments: Vec<Comment>,
     pub amount_expr: Option<String>,
     pub kind: PostingType,
@@ -112,6 +115,9 @@ impl RawPosting {
             amount_expr: None,
             kind: PostingType::Real,
             payee: None,
+            money_format: None,
+            cost_format: None,
+            balance_format: None,
         }
     }
 }
@@ -143,6 +149,7 @@ fn parse_posting(
                     Some(PriceType::PerUnit)
                 };
                 let mut money = part.into_inner().next().unwrap().into_inner();
+                let money_format = money.as_str().to_string();
                 let amount: BigRational;
                 let mut currency = None;
                 match money.next() {
@@ -164,15 +171,18 @@ fn parse_posting(
                     Rule::amount => {
                         posting.money_amount = Some(amount);
                         posting.money_currency = currency;
+                        posting.money_format = Some(money_format);
                     }
                     Rule::cost => {
                         posting.cost_amount = Some(amount);
                         posting.cost_currency = currency;
                         posting.cost_type = cost_type;
+                        posting.cost_format = Some(money_format);
                     }
                     Rule::balance => {
                         posting.balance_amount = Some(amount);
                         posting.balance_currency = currency;
+                        posting.balance_format = Some(money_format);
                     }
                     x => panic!("Expected amount, cost or balance {:?}", x),
                 }