X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=91ea8ffc55bfe394df8b7001c9d9b7ea90b76b9b;hp=7b898593870280e2b1302dff63ce4c44f95c3e0e;hb=2e6d7c5f759986f89a867ee5b9162496019d5130;hpb=7b2966220b258cc2f1becae3ff91ef62a36cc01b

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 7b898593..91ea8ffc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -30,6 +30,7 @@ import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
+import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
 import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 
@@ -44,14 +45,16 @@ 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;
 
 
 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 int MATCHING_TRANSACTIONS_LIMIT = 50;
+    private 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 =
@@ -59,20 +62,17 @@ public class RetrieveTransactionsTask
     private static final Pattern transactionDetailsPattern =
             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;
-    Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
-    Pattern account_value_re = Pattern.compile(
-            "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
-    Pattern tr_end_re = Pattern.compile("</tr>");
-    Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
-    Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
+    private WeakReference<MainActivity> contextRef;
+    private int error;
     // %3A is '='
     private boolean success;
+    private Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+    private Pattern account_value_re = Pattern.compile(
+            "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
     public RetrieveTransactionsTask(WeakReference<MainActivity> contextRef) {
         this.contextRef = contextRef;
     }
-    private static final void L(String msg) {
+    private static void L(String msg) {
         Log.d("transaction-parser", msg);
     }
     @Override
@@ -112,7 +112,9 @@ public class RetrieveTransactionsTask
         success = false;
         ArrayList<LedgerAccount> accountList = new ArrayList<>();
         ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
+        HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;
+        boolean onlyStarred = Data.optShowOnlyStarred.get();
         Data.backgroundTaskCount.incrementAndGet();
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection("journal");
@@ -126,8 +128,6 @@ public class RetrieveTransactionsTask
                             String.format("HTTP error %d", http.getResponseCode()));
                     db.beginTransaction();
                     try {
-                        String ledgerTitle = null;
-
                         db.execSQL("UPDATE transactions set keep=0");
                         db.execSQL("update account_values set keep=0;");
                         db.execSQL("update accounts set keep=0;");
@@ -167,9 +167,38 @@ public class RetrieveTransactionsTask
                                         acct_name = acct_name.replace("\"", "");
                                         L(String.format("found account: %s", acct_name));
 
-                                        profile.storeAccount(acct_name);
-                                        lastAccount = new LedgerAccount(acct_name);
-                                        accountList.add(lastAccount);
+                                        lastAccount = profile.loadAccount(acct_name);
+                                        if (lastAccount == null) {
+                                            lastAccount = new LedgerAccount(acct_name);
+                                            profile.storeAccount(lastAccount);
+                                        }
+
+                                        // 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);
+                                                acc.setHidden(lastAccount.isHidden());
+                                                if (!onlyStarred || !acc.isHidden())
+                                                    accountList.add(acc);
+                                                L(String.format("gap-filling with %s", aName));
+                                                accountNames.put(aName, null);
+                                                profile.storeAccount(acc);
+                                            }
+                                        }
+
+                                        if (!onlyStarred || !lastAccount.isHidden())
+                                            accountList.add(lastAccount);
+                                        accountNames.put(acct_name, null);
 
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
                                         L("→ expecting account amount");
@@ -326,7 +355,7 @@ public class RetrieveTransactionsTask
                         Date now = new Date();
                         profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime());
                         Data.lastUpdateDate.set(now);
-                        Data.transactions.set(transactionList);
+                        TransactionListViewModel.scheduleTransactionListReload();
                     }
                     finally {
                         db.endTransaction();