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=4da02e823111a070efa473edcbdf8c82ab8521b3;hp=508190c70ebdefc2dfaf57465df2de6269c46474;hb=e0b2d33c159281741f3a6e30975d58040a8ab879;hpb=3b365016042215dd73cb4600840aa8199b8322b9 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 508190c7..4da02e82 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,34 +45,34 @@ 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 { - public static final int MATCHING_TRANSACTIONS_LIMIT = 50; - private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+)"); - private static final Pattern transactionDescriptionPattern = + private static final int MATCHING_TRANSACTIONS_LIMIT = 50; + private static final Pattern reComment = Pattern.compile("^\\s*;"); + private static final Pattern reTransactionStart = Pattern.compile("([\\d.-]+)"); + private static final Pattern reTransactionDescription = Pattern.compile(" contextRef; - protected int error; - Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\""); - Pattern account_value_re = Pattern.compile( - "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?"); - Pattern tr_end_re = Pattern.compile(""); - Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b"); - Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\""); + private static final Pattern reTransactionDetails = + Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?"); + private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\""); + private WeakReference contextRef; + private int error; // %3A is '=' private boolean success; + private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\""); + private Pattern reAccountValue = Pattern.compile( + "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?"); public RetrieveTransactionsTask(WeakReference contextRef) { this.contextRef = contextRef; } - private static final void L(String msg) { + private static void L(String msg) { Log.d("transaction-parser", msg); } @Override @@ -110,11 +111,12 @@ public class RetrieveTransactionsTask int maxTransactionId = Progress.INDETERMINATE; success = false; ArrayList accountList = new ArrayList<>(); - ArrayList transactionList = new ArrayList<>(); + HashMap accountNames = new HashMap<>(); LedgerAccount lastAccount = null; + boolean onlyStarred = Data.optShowOnlyStarred.get(); Data.backgroundTaskCount.incrementAndGet(); try { - HttpURLConnection http = NetworkUtil.prepare_connection("journal"); + HttpURLConnection http = NetworkUtil.prepareConnection("journal"); http.setAllowUserInteraction(false); publishProgress(progress); MainActivity ctx = getContext(); @@ -125,8 +127,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;"); @@ -144,6 +144,12 @@ public class RetrieveTransactionsTask while ((line = buf.readLine()) != null) { throwIfCancelled(); Matcher m; + m = reComment.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: @@ -153,16 +159,45 @@ public class RetrieveTransactionsTask Data.accounts.set(accountList); continue; } - m = account_name_re.matcher(line); + m = reAccountName.matcher(line); if (m.find()) { String acct_encoded = m.group(1); String acct_name = URLDecoder.decode(acct_encoded, "UTF-8"); 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 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"); @@ -170,7 +205,7 @@ public class RetrieveTransactionsTask break; case EXPECTING_ACCOUNT_AMOUNT: - m = account_value_re.matcher(line); + m = reAccountValue.matcher(line); boolean match_found = false; while (m.find()) { throwIfCancelled(); @@ -195,7 +230,7 @@ public class RetrieveTransactionsTask case EXPECTING_TRANSACTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = transactionStartPattern.matcher(line); + m = reTransactionStart.matcher(line); if (m.find()) { transactionId = Integer.valueOf(m.group(1)); state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION; @@ -210,7 +245,7 @@ public class RetrieveTransactionsTask progress.setTotal(transactionId); publishProgress(progress); } - m = endPattern.matcher(line); + m = reEnd.matcher(line); if (m.find()) { L("--- transaction value complete ---"); success = true; @@ -220,7 +255,7 @@ public class RetrieveTransactionsTask case EXPECTING_TRANSACTION_DESCRIPTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = transactionDescriptionPattern.matcher(line); + m = reTransactionDescription.matcher(line); if (m.find()) { if (transactionId == 0) throw new TransactionParserException( @@ -273,7 +308,6 @@ public class RetrieveTransactionsTask "transaction %s saved → expecting transaction", transaction.getId())); transaction.finishLoading(); - transactionList.add(transaction); // sounds like a good idea, but transaction-1 may not be the first one chronologically // for example, when you add the initial seeding transaction after entering some others @@ -284,7 +318,7 @@ public class RetrieveTransactionsTask // } } else { - m = transactionDetailsPattern.matcher(line); + m = reTransactionDetails.matcher(line); if (m.find()) { String acc_name = m.group(1); String amount = m.group(2); @@ -297,9 +331,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: @@ -317,9 +351,9 @@ public class RetrieveTransactionsTask Log.d("db", "Updating transaction value stamp"); Date now = new Date(); - profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime()); + profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); Data.lastUpdateDate.set(now); - Data.transactions.set(transactionList); + TransactionListViewModel.scheduleTransactionListReload(); } finally { db.endTransaction();