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=f971cb02eb585232e0662481c549f03503379524;hp=20a8a20bef3ef59ccb776f91cb7863b6b571ac89;hb=b8cf3b58fa7365e62197e7363d1cd72bf4b1406b;hpb=760d6de24d0c4035380c99440f5771ebf2ed96bf
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 20a8a20b..f971cb02 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -22,6 +22,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.OperationCanceledException;
+import net.ktnx.mobileledger.App;
import net.ktnx.mobileledger.err.HTTPException;
import net.ktnx.mobileledger.json.AccountListParser;
import net.ktnx.mobileledger.json.ParsedBalance;
@@ -34,7 +35,6 @@ 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.utils.MLDB;
import net.ktnx.mobileledger.utils.NetworkUtil;
import java.io.BufferedReader;
@@ -54,6 +54,8 @@ import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import androidx.annotation.NonNull;
+
import static net.ktnx.mobileledger.utils.Logger.debug;
@@ -73,8 +75,11 @@ public class RetrieveTransactionsTask
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) {
+ private MobileLedgerProfile profile;
+ public RetrieveTransactionsTask(WeakReference contextRef,
+ @NonNull MobileLedgerProfile profile) {
this.contextRef = contextRef;
+ this.profile = profile;
}
private static void L(String msg) {
//debug("transaction-parser", msg);
@@ -107,7 +112,7 @@ public class RetrieveTransactionsTask
if (context == null) return;
context.onRetrieveDone(null);
}
- private String retrieveTransactionListLegacy(MobileLedgerProfile profile)
+ private String retrieveTransactionListLegacy()
throws IOException, ParseException, HTTPException {
Progress progress = new Progress();
int maxTransactionId = Progress.INDETERMINATE;
@@ -126,217 +131,215 @@ public class RetrieveTransactionsTask
default:
throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
}
- try (SQLiteDatabase db = MLDB.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;
-
-
- 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
-// 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;
- }
- 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 ((!onlyStarred || !acc.isHiddenByStar()) &&
- 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);
- }
- }
- if ((!onlyStarred || !lastAccount.isHiddenByStar()) &&
- lastAccount.isVisible(accountList))
- accountList.add(lastAccount);
- accountNames.put(acct_name, null);
+ 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);
- state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
- L("â expecting account amount");
- }
- break;
+ int matchedTransactionsCount = 0;
- 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 = "";
- 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()) {
- syn.addAmount(val, currency);
- profile.storeAccountValue(db, syn.getName(), currency, val);
+ 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
+// 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;
+ }
+ 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 ((!onlyStarred || !acc.isHiddenByStar()) &&
+ 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);
}
}
- if (match_found) {
- state = ParserState.EXPECTING_ACCOUNT;
- L("â expecting account");
+ if ((!onlyStarred || !lastAccount.isHiddenByStar()) &&
+ lastAccount.isVisible(accountList))
+ accountList.add(lastAccount);
+ accountNames.put(acct_name, null);
+
+ 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 = "";
+ 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);
}
+ }
- break;
+ if (match_found) {
+ syntheticAccounts.clear();
+ state = ParserState.EXPECTING_ACCOUNT;
+ L("â expecting account");
+ }
- 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);
+ 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;
+
+ 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));
}
- m = reEnd.matcher(line);
- if (m.find()) {
- L("--- transaction value complete ---");
- break LINES;
+ catch (ParseException e) {
+ e.printStackTrace();
+ return String.format("Error parsing date '%s'", date);
}
- 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)));
+ }
+ 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;
}
- 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
- 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);
- }
+ else {
+ profile.storeTransaction(db, transaction);
+ matchedTransactionsCount = 0;
+ progress.setTotal(maxTransactionId);
+ }
- state = ParserState.EXPECTING_TRANSACTION;
- L(String.format("transaction %s saved â expecting transaction",
- transaction.getId()));
- transaction.finishLoading();
+ state = ParserState.EXPECTING_TRANSACTION;
+ L(String.format("transaction %s saved â expecting transaction",
+ transaction.getId()));
+ transaction.finishLoading();
// 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
@@ -345,44 +348,42 @@ public class RetrieveTransactionsTask
// "parser");
// break LINES;
// }
+ }
+ 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 {
- 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",
- transactionId, line));
- }
- break;
- default:
- throw new RuntimeException(
- String.format("Unknown parser updating %s", state.name()));
- }
+ 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()));
}
+ }
- throwIfCancelled();
+ throwIfCancelled();
- profile.deleteNotPresentTransactions(db);
- db.setTransactionSuccessful();
+ profile.deleteNotPresentTransactions(db);
+ db.setTransactionSuccessful();
- profile.setLastUpdateStamp();
+ profile.setLastUpdateStamp();
- return null;
- }
- finally {
- db.endTransaction();
- }
+ return null;
+ }
+ finally {
+ db.endTransaction();
}
}
}
@@ -393,8 +394,7 @@ public class RetrieveTransactionsTask
new String[]{profile.getUuid()});
db.execSQL("update accounts set keep=0 where profile=?;", new String[]{profile.getUuid()});
}
- private boolean retrieveAccountList(MobileLedgerProfile profile)
- throws IOException, HTTPException {
+ private boolean retrieveAccountList() throws IOException, HTTPException {
Progress progress = new Progress();
HttpURLConnection http = NetworkUtil.prepareConnection(profile, "accounts");
@@ -408,7 +408,7 @@ public class RetrieveTransactionsTask
throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
}
publishProgress(progress);
- SQLiteDatabase db = MLDB.getDatabase();
+ SQLiteDatabase db = App.getDatabase();
ArrayList accountList = new ArrayList<>();
boolean listFilledOK = false;
try (InputStream resp = http.getInputStream()) {
@@ -481,8 +481,7 @@ public class RetrieveTransactionsTask
return true;
}
- private boolean retrieveTransactionList(MobileLedgerProfile profile)
- throws IOException, ParseException, HTTPException {
+ private boolean retrieveTransactionList() throws IOException, ParseException, HTTPException {
Progress progress = new Progress();
int maxTransactionId = Progress.INDETERMINATE;
@@ -497,7 +496,7 @@ public class RetrieveTransactionsTask
default:
throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
}
- SQLiteDatabase db = MLDB.getDatabase();
+ SQLiteDatabase db = App.getDatabase();
try (InputStream resp = http.getInputStream()) {
if (http.getResponseCode() != 200)
throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
@@ -589,11 +588,10 @@ public class RetrieveTransactionsTask
@SuppressLint("DefaultLocale")
@Override
protected String doInBackground(Void... params) {
- MobileLedgerProfile profile = Data.profile.get();
Data.backgroundTaskStarted();
try {
- if (!retrieveAccountList(profile) || !retrieveTransactionList(profile))
- return retrieveTransactionListLegacy(profile);
+ if (!retrieveAccountList() || !retrieveTransactionList())
+ return retrieveTransactionListLegacy();
return null;
}
catch (MalformedURLException e) {