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;
public class RetrieveTransactionsTask
extends AsyncTask<Void, RetrieveTransactionsTask.Progress, Void> {
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 =
+ private static final Pattern reComment = Pattern.compile("^\\s*;");
+ private static final Pattern reTransactionStart = Pattern.compile("<tr class=\"title\" " +
+ "id=\"transaction-(\\d+)\"><td class=\"date\"[^\"]*>([\\d.-]+)</td>");
+ private static final Pattern reTransactionDescription =
Pattern.compile("<tr class=\"posting\" title=\"(\\S+)\\s(.+)");
- private static final Pattern transactionDetailsPattern =
+ private static final Pattern reTransactionDetails =
Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
- private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
+ private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\"");
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(
+ private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+ private Pattern reAccountValue = Pattern.compile(
"<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
public RetrieveTransactionsTask(WeakReference<MainActivity> contextRef) {
this.contextRef = contextRef;
int maxTransactionId = Progress.INDETERMINATE;
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");
+ HttpURLConnection http = NetworkUtil.prepareConnection("journal");
http.setAllowUserInteraction(false);
publishProgress(progress);
MainActivity ctx = getContext();
while ((line = buf.readLine()) != null) {
throwIfCancelled();
Matcher m;
- m = commentPattern.matcher(line);
+ m = reComment.matcher(line);
if (m.find()) {
// TODO: comments are ignored for now
Log.v("transaction-parser", "Ignoring comment");
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);
+ 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
while (!toAppend.isEmpty()) {
String aName = toAppend.pop();
LedgerAccount acc = new LedgerAccount(aName);
- accountList.add(acc);
+ 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(aName);
+ profile.storeAccount(acc);
}
}
- accountList.add(lastAccount);
+ if (!onlyStarred || !lastAccount.isHidden())
+ accountList.add(lastAccount);
accountNames.put(acct_name, null);
state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
break;
case EXPECTING_ACCOUNT_AMOUNT:
- m = account_value_re.matcher(line);
+ m = reAccountValue.matcher(line);
boolean match_found = false;
while (m.find()) {
throwIfCancelled();
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;
progress.setTotal(transactionId);
publishProgress(progress);
}
- m = endPattern.matcher(line);
+ m = reEnd.matcher(line);
if (m.find()) {
L("--- transaction value complete ---");
success = true;
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(
"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
// }
}
else {
- m = transactionDetailsPattern.matcher(line);
+ m = reTransactionDetails.matcher(line);
if (m.find()) {
String acc_name = m.group(1);
String amount = m.group(2);
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();