gap-fill missing parent accounts in the hierarchy

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / RetrieveTransactionsTask.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
index 508190c70ebdefc2dfaf57465df2de6269c46474..5f241f4fd5985ee2954f4ecab2ecd8e62423f81f 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -44,6 +44,8 @@ import java.net.MalformedURLException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -51,12 +53,13 @@ import java.util.regex.Pattern;
 public class RetrieveTransactionsTask
         extends AsyncTask<Void, RetrieveTransactionsTask.Progress, Void> {
     public static final int MATCHING_TRANSACTIONS_LIMIT = 50;
+    public static final Pattern commentPattern = Pattern.compile("^\\s*;");
     private static final Pattern transactionStartPattern = Pattern.compile("<tr class=\"title\" " +
                                                                            "id=\"transaction-(\\d+)\"><td class=\"date\"[^\"]*>([\\d.-]+)</td>");
     private static final Pattern transactionDescriptionPattern =
             Pattern.compile("<tr class=\"posting\" title=\"(\\S+)\\s(.+)");
     private static final Pattern transactionDetailsPattern =
-            Pattern.compile("^\\s+" + "(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
+            Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
     private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
     protected WeakReference<MainActivity> contextRef;
     protected int error;
@@ -111,6 +114,7 @@ public class RetrieveTransactionsTask
         success = false;
         ArrayList<LedgerAccount> accountList = new ArrayList<>();
         ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
+        HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;
         Data.backgroundTaskCount.incrementAndGet();
         try {
@@ -144,6 +148,12 @@ public class RetrieveTransactionsTask
                         while ((line = buf.readLine()) != null) {
                             throwIfCancelled();
                             Matcher m;
+                            m = commentPattern.matcher(line);
+                            if (m.find()) {
+                                // TODO: comments are ignored for now
+                                Log.v("transaction-parser", "Ignoring comment");
+                                continue;
+                            }
                             //L(String.format("State is %d", updating));
                             switch (state) {
                                 case EXPECTING_ACCOUNT:
@@ -162,7 +172,30 @@ public class RetrieveTransactionsTask
 
                                         profile.storeAccount(acct_name);
                                         lastAccount = new LedgerAccount(acct_name);
+
+                                        // make sure the parent account(s) are present,
+                                        // synthesising them if necessary
+                                        String parentName = lastAccount.getParentName();
+                                        if (parentName != null) {
+                                            Stack<String> toAppend = new Stack<>();
+                                            while (parentName != null) {
+                                                if (accountNames.containsKey(parentName)) break;
+                                                toAppend.push(parentName);
+                                                parentName = new LedgerAccount(parentName)
+                                                        .getParentName();
+                                            }
+                                            while (!toAppend.isEmpty()) {
+                                                String aName = toAppend.pop();
+                                                LedgerAccount acc = new LedgerAccount(aName);
+                                                accountList.add(acc);
+                                                L(String.format("gap-filling with %s", aName));
+                                                accountNames.put(aName, null);
+                                                profile.storeAccount(aName);
+                                            }
+                                        }
+
                                         accountList.add(lastAccount);
+                                        accountNames.put(acct_name, null);
 
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
                                         L("→ expecting account amount");
@@ -297,9 +330,9 @@ public class RetrieveTransactionsTask
                                             L(String.format("%d: %s = %s", transaction.getId(),
                                                     acc_name, amount));
                                         }
-                                        else throw new IllegalStateException(
-                                                String.format("Can't parse transaction %d details",
-                                                        transactionId));
+                                        else throw new IllegalStateException(String.format(
+                                                "Can't parse transaction %d " + "details: %s",
+                                                transactionId, line));
                                     }
                                     break;
                                 default: