Allow specifying extra patterns for Revolut (#81)

* Add extra_patterns

* Fix tests

* Change test

finance-tools.sample.yml

@@ -64,6 +64,8 @@ accounts:
  type: CHQ
  id: 'astark2'
  currency: USD
+ expressions:
+ - account-statement_(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})_en_(\w+)\.csv
  label: Arya Stark - Revolut (US Dollar)
 
 # Categories

finance_toolkit/revolut.py

@@ -1,6 +1,6 @@
 from abc import ABCMeta
 from pathlib import Path
-from typing import Tuple
+from typing import Tuple, List
 
 import pandas as pd
 from pandas import DataFrame
@@ -12,18 +12,26 @@
 
 class RevolutAccount(Account):
  def __init__(
- self, account_type: str, account_id: str, account_num: str, currency: str
+ self,
+ account_type: str,
+ account_id: str,
+ account_num: str,
+ currency: str,
+ extra_patterns: List[str] = None,
  ):
+ patterns = [
+ r"Revolut-(.*)-Statement-(.*)\.csv",
+ r"account-statement_(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})_undefined-undefined_%s\.csv" # noqa
+ % account_num,
+ ]
+ if extra_patterns:
+ patterns.extend(extra_patterns)
  super().__init__(
  account_type=account_type,
  account_id=account_id,
  account_num=account_num,
  currency=currency,
- patterns=[
- r"Revolut-(.*)-Statement-(.*)\.csv",
- r"account-statement_(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})_undefined-undefined_%s\.csv" # noqa
- % account_num,
- ],
+ patterns=patterns,
  )
 
 

finance_toolkit/tx.py

@@ -90,6 +90,7 @@ def load_accounts(cls, raw: Dict) -> List[Account]:
  account_id=symbolic_name,
  account_num=fields["id"],
  currency=fields["currency"],
+ extra_patterns=fields["expressions"] if "expressions" in fields else None,
  )
  )
  elif company == "October":

test/test_tx.py

@@ -643,6 +643,9 @@ def test_configurator_parse_yaml(sample):
  account_id="astark-REV-USD",
  account_num="astark2",
  currency="USD",
+ extra_patterns=[
+ r"account-statement_(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})_en_(\w+)\.csv"
+ ],
  ),
  BnpAccount(
  account_type="LVA",