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=5360cd006e694acef276612afed88724e56d14c6;hp=807e43752cffd6aa7b6ef4427d8b438f7c584247;hb=0a73337c99e2074aa7e7228204289896342ec636;hpb=9620c937d83a50772d5d329fd92b9a055cef56ad 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 807e4375..5360cd00 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -52,23 +52,23 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; import java.util.Locale; -import java.util.Stack; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.ktnx.mobileledger.utils.Logger.debug; - public class RetrieveTransactionsTask extends AsyncTask { private static final int MATCHING_TRANSACTIONS_LIMIT = 150; private static final Pattern reComment = Pattern.compile("^\\s*;"); - private static final Pattern reTransactionStart = Pattern.compile("([\\d.-]+)"); + private static final Pattern reTransactionStart = Pattern.compile( + "([\\d.-]+)"); private static final Pattern reTransactionDescription = Pattern.compile(" 0)) { + if ((currencyPost != null) && (currencyPost.length() > 0)) + return null; + currency = currencyPre; + } + else if ((currencyPost != null) && (currencyPost.length() > 0)) { + currency = currencyPost; + } + + amount = amount.replace(',', '.'); + + return new LedgerTransactionAccount(acc_name, Float.parseFloat(amount), currency, null); + } + else { + return null; + } + } @Override protected void onProgressUpdate(Progress... values) { super.onProgressUpdate(values); MainActivity context = getContext(); - if (context == null) return; + if (context == null) + return; context.onRetrieveProgress(values[0]); } @Override protected void onPreExecute() { super.onPreExecute(); MainActivity context = getContext(); - if (context == null) return; + if (context == null) + return; context.onRetrieveStart(); } @Override protected void onPostExecute(String error) { super.onPostExecute(error); MainActivity context = getContext(); - if (context == null) return; + if (context == null) + return; context.onRetrieveDone(error); } @Override protected void onCancelled() { super.onCancelled(); MainActivity context = getContext(); - if (context == null) return; + if (context == null) + return; context.onRetrieveDone(null); } - private String retrieveTransactionListLegacy() - throws IOException, ParseException, HTTPException { + private String retrieveTransactionListLegacy() throws IOException, HTTPException { Progress progress = new Progress(); int maxTransactionId = Progress.INDETERMINATE; - ArrayList accountList = new ArrayList<>(); - HashMap accountNames = new HashMap<>(); - HashMap syntheticAccounts = new HashMap<>(); - LedgerAccount lastAccount = null, prevAccount = null; + ArrayList list = new ArrayList<>(); + HashMap map = new HashMap<>(); + ArrayList displayed = new ArrayList<>(); + ArrayList transactions = new ArrayList<>(); + LedgerAccount lastAccount = null; + ArrayList syntheticAccounts = new ArrayList<>(); HttpURLConnection http = NetworkUtil.prepareConnection(profile, "journal"); http.setAllowUserInteraction(false); publishProgress(progress); - switch (http.getResponseCode()) { - case 200: - break; - default: - throw new HTTPException(http.getResponseCode(), http.getResponseMessage()); - } + if (http.getResponseCode() != 200) + throw new HTTPException(http.getResponseCode(), http.getResponseMessage()); - SQLiteDatabase db = App.getDatabase(); try (InputStream resp = http.getInputStream()) { if (http.getResponseCode() != 200) throw new IOException(String.format("HTTP error %d", http.getResponseCode())); - db.beginTransaction(); - try { - prepareDbForRetrieval(db, profile); - int matchedTransactionsCount = 0; + int matchedTransactionsCount = 0; + ParserState state = ParserState.EXPECTING_ACCOUNT; + String line; + BufferedReader buf = + new BufferedReader(new InputStreamReader(resp, StandardCharsets.UTF_8)); - ParserState state = ParserState.EXPECTING_ACCOUNT; - String line; - BufferedReader buf = - new BufferedReader(new InputStreamReader(resp, StandardCharsets.UTF_8)); - - int processedTransactionCount = 0; - int transactionId = 0; - LedgerTransaction transaction = null; - LINES: - while ((line = buf.readLine()) != null) { - throwIfCancelled(); - Matcher m; - m = reComment.matcher(line); - if (m.find()) { - // TODO: comments are ignored for now + int processedTransactionCount = 0; + int transactionId = 0; + LedgerTransaction transaction = null; + LINES: + 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: - if (line.equals("

General Journal

")) { - state = ParserState.EXPECTING_TRANSACTION; - L("→ expecting transaction"); - // commit the current transaction and start a new one - // the account list in the UI should reflect the (committed) - // state of the database - db.setTransactionSuccessful(); - db.endTransaction(); - Data.accounts.setList(accountList); - db.beginTransaction(); + continue; + } + //L(String.format("State is %d", updating)); + switch (state) { + case EXPECTING_ACCOUNT: + if (line.equals("

General Journal

")) { + state = ParserState.EXPECTING_TRANSACTION; + L("→ expecting transaction"); + continue; + } + m = reAccountName.matcher(line); + if (m.find()) { + String acct_encoded = m.group(1); + String accName = URLDecoder.decode(acct_encoded, "UTF-8"); + accName = accName.replace("\"", ""); + L(String.format("found account: %s", accName)); + + lastAccount = map.get(accName); + if (lastAccount != null) { + L(String.format("ignoring duplicate account '%s'", accName)); continue; } - 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)); - - prevAccount = lastAccount; - lastAccount = profile.tryLoadAccount(db, acct_name); - if (lastAccount == null) lastAccount = new LedgerAccount(acct_name); - else lastAccount.removeAmounts(); - profile.storeAccount(db, lastAccount); - - if (prevAccount != null) prevAccount - .setHasSubAccounts(prevAccount.isParentOf(lastAccount)); - // make sure the parent account(s) are present, - // synthesising them if necessary - // this happens when the (missing-in-HTML) parent account has - // only one child so we create a synthetic parent account record, - // copying the amounts when child's amounts are parsed - 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(); - } - syntheticAccounts.clear(); - while (!toAppend.isEmpty()) { - String aName = toAppend.pop(); - LedgerAccount acc = profile.tryLoadAccount(db, aName); - if (acc == null) { - acc = new LedgerAccount(aName); - acc.setHiddenByStar(lastAccount.isHiddenByStar()); - acc.setExpanded(!lastAccount.hasSubAccounts() || - lastAccount.isExpanded()); - } - acc.setHasSubAccounts(true); - acc.removeAmounts(); // filled below when amounts are parsed - if (acc.isVisible(accountList)) - accountList.add(acc); - L(String.format("gap-filling with %s", aName)); - accountNames.put(aName, null); - profile.storeAccount(db, acc); - syntheticAccounts.put(aName, acc); - } - } + String parentAccountName = LedgerAccount.extractParentName(accName); + LedgerAccount parentAccount; + if (parentAccountName != null) { + parentAccount = ensureAccountExists(parentAccountName, map, + syntheticAccounts); + } + else { + parentAccount = null; + } + lastAccount = new LedgerAccount(profile, accName, parentAccount); - if (lastAccount.isVisible(accountList)) - accountList.add(lastAccount); - accountNames.put(acct_name, null); + list.add(lastAccount); + map.put(accName, lastAccount); - state = ParserState.EXPECTING_ACCOUNT_AMOUNT; - L("→ expecting account amount"); - } - break; - - case EXPECTING_ACCOUNT_AMOUNT: - m = reAccountValue.matcher(line); - boolean match_found = false; - while (m.find()) { - throwIfCancelled(); - - match_found = true; - String value = m.group(1); - String currency = m.group(2); - if (currency == null) currency = ""; - - { - Matcher tmpM = reDecimalComma.matcher(value); - if (tmpM.find()) { - value = value.replace(".", ""); - value = value.replace(',', '.'); - } - - tmpM = reDecimalPoint.matcher(value); - if (tmpM.find()) { - value = value.replace(",", ""); - value = value.replace(" ", ""); - } + state = ParserState.EXPECTING_ACCOUNT_AMOUNT; + L("→ expecting account amount"); + } + break; + + case EXPECTING_ACCOUNT_AMOUNT: + m = reAccountValue.matcher(line); + boolean match_found = false; + while (m.find()) { + throwIfCancelled(); + + match_found = true; + String value = Objects.requireNonNull(m.group(1)); + String currency = m.group(2); + if (currency == null) + currency = ""; + + { + Matcher tmpM = reDecimalComma.matcher(value); + if (tmpM.find()) { + value = value.replace(".", ""); + value = value.replace(',', '.'); } - L("curr=" + currency + ", value=" + value); - final float val = Float.parseFloat(value); - profile.storeAccountValue(db, lastAccount.getName(), currency, val); - lastAccount.addAmount(val, currency); - for (LedgerAccount syn : syntheticAccounts.values()) { - L(String.format(Locale.ENGLISH, "propagating %s %1.2f to %s", - currency, val, syn.getName())); - syn.addAmount(val, currency); - profile.storeAccountValue(db, syn.getName(), currency, val); + + tmpM = reDecimalPoint.matcher(value); + if (tmpM.find()) { + value = value.replace(",", ""); + value = value.replace(" ", ""); } } - - if (match_found) { - syntheticAccounts.clear(); - state = ParserState.EXPECTING_ACCOUNT; - L("→ expecting account"); + L("curr=" + currency + ", value=" + value); + final float val = Float.parseFloat(value); + lastAccount.addAmount(val, currency); + for (LedgerAccount syn : syntheticAccounts) { + L(String.format(Locale.ENGLISH, "propagating %s %1.2f to %s", + currency, val, syn.getName())); + syn.addAmount(val, currency); } + } - break; - - case EXPECTING_TRANSACTION: - if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = reTransactionStart.matcher(line); - if (m.find()) { - transactionId = Integer.valueOf(m.group(1)); - state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION; - L(String.format(Locale.ENGLISH, - "found transaction %d → expecting description", - transactionId)); - progress.setProgress(++processedTransactionCount); - if (maxTransactionId < transactionId) - maxTransactionId = transactionId; - if ((progress.getTotal() == Progress.INDETERMINATE) || - (progress.getTotal() < transactionId)) - progress.setTotal(transactionId); - publishProgress(progress); - } - m = reEnd.matcher(line); - if (m.find()) { - L("--- transaction value complete ---"); - break LINES; - } - break; + if (match_found) { + syntheticAccounts.clear(); + state = ParserState.EXPECTING_ACCOUNT; + L("→ expecting account"); + } - case EXPECTING_TRANSACTION_DESCRIPTION: - if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = reTransactionDescription.matcher(line); - if (m.find()) { - if (transactionId == 0) throw new TransactionParserException( + break; + + case EXPECTING_TRANSACTION: + if (!line.isEmpty() && (line.charAt(0) == ' ')) + continue; + m = reTransactionStart.matcher(line); + if (m.find()) { + transactionId = Integer.parseInt(Objects.requireNonNull(m.group(1))); + state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION; + L(String.format(Locale.ENGLISH, + "found transaction %d → expecting description", transactionId)); + progress.setProgress(++processedTransactionCount); + if (maxTransactionId < transactionId) + maxTransactionId = transactionId; + if ((progress.getTotal() == Progress.INDETERMINATE) || + (progress.getTotal() < transactionId)) + progress.setTotal(transactionId); + publishProgress(progress); + } + m = reEnd.matcher(line); + if (m.find()) { + L("--- transaction value complete ---"); + break LINES; + } + break; + + case EXPECTING_TRANSACTION_DESCRIPTION: + if (!line.isEmpty() && (line.charAt(0) == ' ')) + continue; + m = reTransactionDescription.matcher(line); + if (m.find()) { + if (transactionId == 0) + throw new TransactionParserException( "Transaction Id is 0 while expecting " + "description"); - String date = m.group(1); - try { - int equalsIndex = date.indexOf('='); - if (equalsIndex >= 0) date = date.substring(equalsIndex + 1); - transaction = - new LedgerTransaction(transactionId, date, m.group(2)); - } - catch (ParseException e) { - e.printStackTrace(); - return String.format("Error parsing date '%s'", date); - } - state = ParserState.EXPECTING_TRANSACTION_DETAILS; - L(String.format(Locale.ENGLISH, - "transaction %d created for %s (%s) →" + - " expecting details", transactionId, date, m.group(2))); + String date = Objects.requireNonNull(m.group(1)); + try { + int equalsIndex = date.indexOf('='); + if (equalsIndex >= 0) + date = date.substring(equalsIndex + 1); + transaction = + new LedgerTransaction(transactionId, date, m.group(2)); } - break; - - case EXPECTING_TRANSACTION_DETAILS: - if (line.isEmpty()) { - // transaction data collected - if (transaction.existsInDb(db)) { - profile.markTransactionAsPresent(db, transaction); - matchedTransactionsCount++; - - if (matchedTransactionsCount == MATCHING_TRANSACTIONS_LIMIT) { - profile.markTransactionsBeforeTransactionAsPresent(db, - transaction); - progress.setTotal(progress.getProgress()); - publishProgress(progress); - break LINES; - } - } - else { - profile.storeTransaction(db, transaction); - matchedTransactionsCount = 0; - progress.setTotal(maxTransactionId); - } + catch (ParseException e) { + e.printStackTrace(); + return String.format("Error parsing date '%s'", date); + } + state = ParserState.EXPECTING_TRANSACTION_DETAILS; + L(String.format(Locale.ENGLISH, + "transaction %d created for %s (%s) →" + " expecting details", + transactionId, date, m.group(2))); + } + break; + + case EXPECTING_TRANSACTION_DETAILS: + if (line.isEmpty()) { + // transaction data collected - state = ParserState.EXPECTING_TRANSACTION; - L(String.format("transaction %s saved → expecting transaction", - transaction.getId())); - transaction.finishLoading(); + transaction.finishLoading(); + transactions.add(transaction); + + state = ParserState.EXPECTING_TRANSACTION; + L(String.format("transaction %s parsed → expecting transaction", + transaction.getId())); // 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 // if (transactionId == 1) { -// L("This was the initial transaction. Terminating " + +// L("This was the initial transaction. +// Terminating " + // "parser"); // break LINES; // } + } + else { + LedgerTransactionAccount lta = parseTransactionAccountLine(line); + if (lta != null) { + transaction.addAccount(lta); + L(String.format(Locale.ENGLISH, "%d: %s = %s", transaction.getId(), + lta.getAccountName(), lta.getAmount())); } - else { - m = reTransactionDetails.matcher(line); - if (m.find()) { - String acc_name = m.group(1); - String amount = m.group(2); - String currency = m.group(3); - if (currency == null) currency = ""; - amount = amount.replace(',', '.'); - transaction.addAccount(new LedgerTransactionAccount(acc_name, - Float.valueOf(amount), currency)); - L(String.format(Locale.ENGLISH, "%d: %s = %s", - transaction.getId(), acc_name, amount)); - } - else throw new IllegalStateException( - String.format("Can't parse transaction %d " + "details: %s", + else + throw new IllegalStateException( + String.format("Can't parse transaction %d details: %s", transactionId, line)); - } - break; - default: - throw new RuntimeException( - String.format("Unknown parser updating %s", state.name())); - } + } + break; + default: + throw new RuntimeException( + String.format("Unknown parser updating %s", state.name())); } + } - throwIfCancelled(); - - profile.deleteNotPresentTransactions(db); - db.setTransactionSuccessful(); + throwIfCancelled(); - profile.setLastUpdateStamp(); + profile.setAndStoreAccountAndTransactionListFromWeb(list, transactions); - return null; - } - finally { - db.endTransaction(); - } + return null; } } - private void prepareDbForRetrieval(SQLiteDatabase db, MobileLedgerProfile profile) { - db.execSQL("UPDATE transactions set keep=0 where profile=?", - new String[]{profile.getUuid()}); - db.execSQL("update account_values set keep=0 where profile=?;", - new String[]{profile.getUuid()}); - db.execSQL("update accounts set keep=0 where profile=?;", new String[]{profile.getUuid()}); + private @NonNull + LedgerAccount ensureAccountExists(String accountName, HashMap map, + ArrayList createdAccounts) { + LedgerAccount acc = map.get(accountName); + + if (acc != null) + return acc; + + String parentName = LedgerAccount.extractParentName(accountName); + LedgerAccount parentAccount; + if (parentName != null) { + parentAccount = ensureAccountExists(parentName, map, createdAccounts); + } + else { + parentAccount = null; + } + + acc = new LedgerAccount(profile, accountName, parentAccount); + createdAccounts.add(acc); + return acc; } private boolean retrieveAccountList() throws IOException, HTTPException { Progress progress = new Progress(); @@ -422,81 +401,85 @@ public class RetrieveTransactionsTask } publishProgress(progress); SQLiteDatabase db = App.getDatabase(); - ArrayList accountList = new ArrayList<>(); - boolean listFilledOK = false; + ArrayList list = new ArrayList<>(); + HashMap map = new HashMap<>(); + HashMap currentMap = new HashMap<>(); + for (LedgerAccount acc : Objects.requireNonNull(profile.getAllAccounts())) + currentMap.put(acc.getName(), acc); try (InputStream resp = http.getInputStream()) { if (http.getResponseCode() != 200) throw new IOException(String.format("HTTP error %d", http.getResponseCode())); - db.beginTransaction(); - try { - profile.markAccountsAsNotPresent(db); + AccountListParser parser = new AccountListParser(resp); - AccountListParser parser = new AccountListParser(resp); + while (true) { + throwIfCancelled(); + ParsedLedgerAccount parsedAccount = parser.nextAccount(); + if (parsedAccount == null) { + break; + } - LedgerAccount prevAccount = null; + final String accName = parsedAccount.getAname(); + LedgerAccount acc = map.get(accName); + if (acc != null) + throw new RuntimeException( + String.format("Account '%s' already present", acc.getName())); + String parentName = LedgerAccount.extractParentName(accName); + ArrayList createdParents = new ArrayList<>(); + LedgerAccount parent; + if (parentName == null) { + parent = null; + } + else { + parent = ensureAccountExists(parentName, map, createdParents); + parent.setHasSubAccounts(true); + } + acc = new LedgerAccount(profile, accName, parent); + list.add(acc); + map.put(accName, acc); - while (true) { + String lastCurrency = null; + float lastCurrencyAmount = 0; + for (ParsedBalance b : parsedAccount.getAibalance()) { throwIfCancelled(); - ParsedLedgerAccount parsedAccount = parser.nextAccount(); - if (parsedAccount == null) break; - - LedgerAccount acc = profile.tryLoadAccount(db, parsedAccount.getAname()); - if (acc == null) acc = new LedgerAccount(parsedAccount.getAname()); - else acc.removeAmounts(); - - profile.storeAccount(db, acc); - String lastCurrency = null; - float lastCurrencyAmount = 0; - for (ParsedBalance b : parsedAccount.getAibalance()) { - final String currency = b.getAcommodity(); - final float amount = b.getAquantity().asFloat(); - if (currency.equals(lastCurrency)) lastCurrencyAmount += amount; - else { - if (lastCurrency != null) { - profile.storeAccountValue(db, acc.getName(), lastCurrency, - lastCurrencyAmount); - acc.addAmount(lastCurrencyAmount, lastCurrency); - } - lastCurrency = currency; - lastCurrencyAmount = amount; - } + final String currency = b.getAcommodity(); + final float amount = b.getAquantity() + .asFloat(); + if (currency.equals(lastCurrency)) { + lastCurrencyAmount += amount; } - if (lastCurrency != null) { - profile.storeAccountValue(db, acc.getName(), lastCurrency, - lastCurrencyAmount); - acc.addAmount(lastCurrencyAmount, lastCurrency); - } - - if (acc.isVisible(accountList)) accountList.add(acc); - - if (prevAccount != null) { - prevAccount.setHasSubAccounts( - acc.getName().startsWith(prevAccount.getName() + ":")); + else { + if (lastCurrency != null) { + acc.addAmount(lastCurrencyAmount, lastCurrency); + } + lastCurrency = currency; + lastCurrencyAmount = amount; } - - prevAccount = acc; } - throwIfCancelled(); - - profile.deleteNotPresentAccounts(db); - throwIfCancelled(); - db.setTransactionSuccessful(); - listFilledOK = true; + if (lastCurrency != null) { + acc.addAmount(lastCurrencyAmount, lastCurrency); + } + for (LedgerAccount p : createdParents) + acc.propagateAmountsTo(p); } - finally { - db.endTransaction(); + throwIfCancelled(); + } + + // the current account tree may have changed, update the new-to be tree to match + for (LedgerAccount acc : list) { + LedgerAccount prevData = currentMap.get(acc.getName()); + if (prevData != null) { + acc.setExpanded(prevData.isExpanded()); + acc.setAmountsExpanded(prevData.amountsExpanded()); } } - // should not be set in the DB transaction, because of a possible deadlock - // with the main and DbOpQueueRunner threads - if (listFilledOK) Data.accounts.setList(accountList); + profile.setAndStoreAccountListFromWeb(list); return true; } private boolean retrieveTransactionList() throws IOException, ParseException, HTTPException { Progress progress = new Progress(); - int maxTransactionId = Progress.INDETERMINATE; + int maxTransactionId = Data.transactions.size(); HttpURLConnection http = NetworkUtil.prepareConnection(profile, "transactions"); http.setAllowUserInteraction(false); @@ -509,90 +492,30 @@ public class RetrieveTransactionsTask default: throw new HTTPException(http.getResponseCode(), http.getResponseMessage()); } - SQLiteDatabase db = App.getDatabase(); try (InputStream resp = http.getInputStream()) { - if (http.getResponseCode() != 200) - throw new IOException(String.format("HTTP error %d", http.getResponseCode())); throwIfCancelled(); - db.beginTransaction(); - try { - profile.markTransactionsAsNotPresent(db); - - int matchedTransactionsCount = 0; - TransactionListParser parser = new TransactionListParser(resp); + ArrayList trList = new ArrayList<>(); - int processedTransactionCount = 0; - - DetectedTransactionOrder transactionOrder = DetectedTransactionOrder.UNKNOWN; - int orderAccumulator = 0; - int lastTransactionId = 0; - - while (true) { - throwIfCancelled(); - ParsedLedgerTransaction parsedTransaction = parser.nextTransaction(); - throwIfCancelled(); - if (parsedTransaction == null) break; - - LedgerTransaction transaction = parsedTransaction.asLedgerTransaction(); - if (transaction.getId() > lastTransactionId) orderAccumulator++; - else orderAccumulator--; - lastTransactionId = transaction.getId(); - if (transactionOrder == DetectedTransactionOrder.UNKNOWN) { - if (orderAccumulator > 30) { - transactionOrder = DetectedTransactionOrder.FILE; - debug("rtt", String.format(Locale.ENGLISH, - "Detected native file order after %d transactions (factor %d)", - processedTransactionCount, orderAccumulator)); - progress.setTotal(Data.transactions.size()); - } - else if (orderAccumulator < -30) { - transactionOrder = DetectedTransactionOrder.REVERSE_CHRONOLOGICAL; - debug("rtt", String.format(Locale.ENGLISH, - "Detected reverse chronological order after %d transactions (factor %d)", - processedTransactionCount, orderAccumulator)); - } - } + TransactionListParser parser = new TransactionListParser(resp); - if (transaction.existsInDb(db)) { - profile.markTransactionAsPresent(db, transaction); - matchedTransactionsCount++; - - if ((transactionOrder == DetectedTransactionOrder.REVERSE_CHRONOLOGICAL) && - (matchedTransactionsCount == MATCHING_TRANSACTIONS_LIMIT)) - { - profile.markTransactionsBeforeTransactionAsPresent(db, transaction); - progress.setTotal(progress.getProgress()); - publishProgress(progress); - db.setTransactionSuccessful(); - profile.setLastUpdateStamp(); - return true; - } - } - else { - profile.storeTransaction(db, transaction); - matchedTransactionsCount = 0; - progress.setTotal(maxTransactionId); - } - - - if ((transactionOrder != DetectedTransactionOrder.UNKNOWN) && - ((progress.getTotal() == Progress.INDETERMINATE) || - (progress.getTotal() < transaction.getId()))) - progress.setTotal(transaction.getId()); - - progress.setProgress(++processedTransactionCount); - publishProgress(progress); - } + int processedTransactionCount = 0; + while (true) { throwIfCancelled(); - profile.deleteNotPresentTransactions(db); + ParsedLedgerTransaction parsedTransaction = parser.nextTransaction(); throwIfCancelled(); - db.setTransactionSuccessful(); - profile.setLastUpdateStamp(); - } - finally { - db.endTransaction(); + if (parsedTransaction == null) + break; + + LedgerTransaction transaction = parsedTransaction.asLedgerTransaction(); + trList.add(transaction); + + progress.setProgress(++processedTransactionCount); + publishProgress(progress); } + + throwIfCancelled(); + profile.setAndStoreTransactionList(trList); } return true; @@ -635,16 +558,15 @@ public class RetrieveTransactionsTask return contextRef.get(); } private void throwIfCancelled() { - if (isCancelled()) throw new OperationCanceledException(null); + if (isCancelled()) + throw new OperationCanceledException(null); } - enum DetectedTransactionOrder {UNKNOWN, REVERSE_CHRONOLOGICAL, FILE} - private enum ParserState { - EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_JOURNAL, EXPECTING_TRANSACTION, + EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_TRANSACTION, EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS } - public class Progress { + public static class Progress { public static final int INDETERMINATE = -1; private int progress; private int total; @@ -669,7 +591,7 @@ public class RetrieveTransactionsTask } } - private class TransactionParserException extends IllegalStateException { + private static class TransactionParserException extends IllegalStateException { TransactionParserException(String message) { super(message); }